Updates to match OOM onap-parameters.yaml changes

Change-Id: I76149fa3762221a8c1fc0cee6a44d83238ebdb89
Issue-ID: INT-381
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

6 files changed, 15 insertions, 12 deletions

diff --git a/deployment/heat/onap-oom/env/gwu/onap-openrc b/deployment/heat/onap-oom/env/gwu/onap-openrc
new file mode 120000
index 000000000..c08bcbda6
--- /dev/null
+++ b/deployment/heat/onap-oom/env/gwu/onap-openrc
@@ -0,0 +1 @@
+../../../../../test/ete/labs/gwu/onap-openrc
\ No newline at end of file
diff --git a/deployment/heat/onap-oom/env/gwu/onap.env b/deployment/heat/onap-oom/env/gwu/onap.env
index 6c03e947e..3ca447d70 100644
--- a/deployment/heat/onap-oom/env/gwu/onap.env
+++ b/deployment/heat/onap-oom/env/gwu/onap.env
@@ -19,15 +19,15 @@ parameters:
   public_net_id: 024582bd-ef9b-48b9-9e70-e6732559d9df
   public_net_name: provider
 
-  dcae_keystone_url: http://192.168.1.11:5000/v2.0
   oam_network_cidr: 172.16.0.0/16
-  dcae_ip_addr: 172.16.0.4
   dns_forwarder: 192.168.1.11
   external_dns: 192.168.1.3
 
-  dnsaas_proxy_enable: false
-  dnsaas_keystone_url: http://192.168.1.11:5000/v2.0
+  dnsaas_proxy_enable: "false"
+  dnsaas_proxied_keystone_url_path: "v2.0"
+  dnsaas_keystone_url: http://192.168.1.11:5000
   dnsaas_region: RegionOne
+  dnsaas_tenant_id: 4c93f99551604bf7af25a8f80c7f34cb
   dnsaas_tenant_name: onap
   dnsaas_username: demo
   dnsaas_password: demo
diff --git a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom-openrc b/deployment/heat/onap-oom/env/huawei/onap-beijing-oom-openrc
new file mode 120000
index 000000000..38d9b3ffd
--- /dev/null
+++ b/deployment/heat/onap-oom/env/huawei/onap-beijing-oom-openrc
@@ -0,0 +1 @@
+../../../../../test/ete/labs/huawei/onap-beijing-oom-openrc
\ No newline at end of file
diff --git a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env b/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env
index 80d65de55..0365c751c 100644
--- a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env
+++ b/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env
@@ -19,15 +19,15 @@ parameters:
   public_net_id: 3a6247f1-fac6-4167-a49f-33cc8415ccf4
   public_net_name: provider
 
-  dcae_keystone_url: http://10.145.122.117:5000/v2.0
   oam_network_cidr: 172.16.0.0/16
-  dcae_ip_addr: 172.16.0.4
   dns_forwarder: 10.145.122.117
   external_dns: 10.145.122.118
 
-  dnsaas_proxy_enable: false
-  dnsaas_keystone_url: http://10.145.122.117:5000/v2.0
+  dnsaas_proxy_enable: "false"
+  dnsaas_proxied_keystone_url_path: "v2.0"
+  dnsaas_keystone_url: http://10.145.122.117:5000
   dnsaas_region: RegionOne
+  dnsaas_tenant_id: 3d228d2fcbb7447bbba3cde703431bc1
   dnsaas_tenant_name: onap-beijing-oom
   dnsaas_username: demo
   dnsaas_password: demo
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins-openrc b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins-openrc
new file mode 120000
index 000000000..7f4cc2547
--- /dev/null
+++ b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins-openrc
@@ -0,0 +1 @@
+../../../../../test/ete/labs/windriver/Integration-Jenkins-openrc
\ No newline at end of file
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
index 867d2ded4..a3290a3cd 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
@@ -19,15 +19,15 @@ parameters:
   public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
   public_net_name: external
 
-  dcae_keystone_url: "http://10.0.14.1/api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0"
   oam_network_cidr: 10.0.0.0/16
-  dcae_ip_addr: 10.0.4.1
   dns_forwarder: 10.12.25.5
   external_dns: 8.8.8.8
 
-  dnsaas_proxy_enable: true
-  dnsaas_keystone_url: http://10.12.25.5:5000/v2.0
+  dnsaas_proxy_enable: "true"
+  dnsaas_proxied_keystone_url_path: "api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0"
+  dnsaas_keystone_url: http://10.12.25.5:5000
   dnsaas_region: RegionOne
+  dnsaas_tenant_id: bf80d09fbc804b42b3bc727d6cf1fcbe
   dnsaas_tenant_name: Integration-Jenkins
   dnsaas_username: demo
   dnsaas_password: onapdemo