commit 2e11bbcbfcb5e7fa53a42e451fec7691a7690435
author Gary Wu <gary.i.wu@huawei.com> Tue Jan 16 01:03:51 2018 +0000
committer Gerrit Code Review <gerrit@onap.org> Tue Jan 16 01:03:51 2018 +0000
tree 587b2c0644d6298a823a8afc9b08460bda9a9880
parent 34e62ce1b4b22fa238b85755b452426956dbf224
parent 918421d8d0bc97be6c9315cceff7563169250509

Merge "Updating APPC CSIT release support"

test/ete/labs/gwu/onap-openstack-template.env

diff --git a/test/ete/labs/gwu/onap-openstack-template.env b/test/ete/labs/gwu/onap-openstack-template.env
index b657290..363e935 100644
--- a/test/ete/labs/gwu/onap-openstack-template.env
+++ b/test/ete/labs/gwu/onap-openstack-template.env
@@ -96,13 +96,13 @@
   #                         #
   ###########################
 
-  dnsaas_config_enabled: true
+  dnsaas_config_enabled: false
   dnsaas_region: RegionOne
-  dnsaas_keystone_url: http://10.12.25.5:5000/v3
+  dnsaas_keystone_url: http://controller.local.enacct.com:5000/v3
   dnsaas_tenant_name: ${OS_PROJECT_NAME}
   dnsaas_username: ${OS_USERNAME}
   dnsaas_password: ${OS_PASSWORD}
-  dcae_keystone_url: "http://172.16.14.1/api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0"
+  dcae_keystone_url: http://controller.local.enacct.com:5000/v2.0
   dcae_centos_7_image: centos7
   dcae_domain: dcaeg2.onap.org
   dcae_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh

test/ete/labs/huawei/onap-openstack-template.env

diff --git a/test/ete/labs/huawei/onap-openstack-template.env b/test/ete/labs/huawei/onap-openstack-template.env
index 188e982..b26bca1 100644
--- a/test/ete/labs/huawei/onap-openstack-template.env
+++ b/test/ete/labs/huawei/onap-openstack-template.env
@@ -96,13 +96,13 @@
   #                         #
   ###########################
 
-  dnsaas_config_enabled: true
+  dnsaas_config_enabled: false
   dnsaas_region: RegionOne
   dnsaas_keystone_url: http://controller.neo.futurewei.com:5000/v3
   dnsaas_tenant_name: ${OS_PROJECT_NAME}
   dnsaas_username: ${OS_USERNAME}
   dnsaas_password: ${OS_PASSWORD}
-  dcae_keystone_url: "http://172.16.14.1/api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0"
+  dcae_keystone_url: http://controller.neo.futurewei.com:5000/v2.0
   dcae_centos_7_image: centos7
   dcae_domain: dcaeg2.onap.org
   dcae_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh