Use numeric IP addresses for lab end points

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

diff --git a/test/ete/labs/gwu/apt-proxy.sh b/test/ete/labs/gwu/apt-proxy.sh
index 200d1d0..d69415b 100755 (executable)
--- a/test/ete/labs/gwu/apt-proxy.sh
+++ b/test/ete/labs/gwu/apt-proxy.sh
@@ -5,11 +5,11 @@ sed -i '/#!\/bin\/bash/a\
             mkdir -p /etc/docker\
             cat > /etc/docker/daemon.json <<EOF\
             {\
-              "insecure-registries" : ["force.local.enacct.com:5000"]\
+              "insecure-registries" : ["192.168.1.51:5000"]\
             }\
             EOF\
             cat > /etc/apt/apt.conf.d/30proxy<<EOF\
-            Acquire::http { Proxy "http://force.local.enacct.com:3142"; };\
+            Acquire::http { Proxy "http://192.168.1.51:3142"; };\
             Acquire::https::Proxy "DIRECT";\
             EOF\
             apt-get -y update' $1

diff --git a/test/ete/labs/gwu/onap-openstack-template.env b/test/ete/labs/gwu/onap-openstack-template.env
index 67a520d..97adca2 100644 (file)
--- a/test/ete/labs/gwu/onap-openstack-template.env
+++ b/test/ete/labs/gwu/onap-openstack-template.env
@@ -32,7 +32,7 @@ parameters:
 
   nexus_repo: https://nexus.onap.org/content/sites/raw
 
-  nexus_docker_repo: force.local.enacct.com:5000
+  nexus_docker_repo: 192.168.1.51:5000
 
   nexus_username: anonymous
 
@@ -54,9 +54,9 @@ parameters:
 
   openstack_region: RegionOne
 
-  horizon_url: http://controller.local.enacct.com/horizon
+  horizon_url: http://192.168.1.11/horizon
 
-  keystone_url: http://controller.local.enacct.com:5000
+  keystone_url: http://192.168.1.11:5000
 
   cloud_env: RegionOne
 
@@ -98,11 +98,11 @@ parameters:
 
   dnsaas_config_enabled: false
   dnsaas_region: RegionOne
-  dnsaas_keystone_url: http://controller.local.enacct.com:5000/v3
+  dnsaas_keystone_url: http://192.168.1.11:5000/v3
   dnsaas_tenant_name: ${OS_PROJECT_NAME}
   dnsaas_username: ${OS_USERNAME}
   dnsaas_password: ${OS_PASSWORD}
-  dcae_keystone_url: http://controller.local.enacct.com:5000/v2.0
+  dcae_keystone_url: http://192.168.1.11: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

diff --git a/test/ete/labs/huawei/apt-proxy.sh b/test/ete/labs/huawei/apt-proxy.sh
index 82cc4f7..37018ca 100755 (executable)
--- a/test/ete/labs/huawei/apt-proxy.sh
+++ b/test/ete/labs/huawei/apt-proxy.sh
@@ -3,11 +3,11 @@ sed -i '/#!\/bin\/bash/a\
             mkdir -p /etc/docker\
             cat > /etc/docker/daemon.json <<EOF\
             {\
-              "insecure-registries" : ["docker-proxy.neo.futurewei.com:5000"]\
+              "insecure-registries" : ["10.145.122.118:5000"]\
             }\
             EOF\
             cat > /etc/apt/apt.conf.d/30proxy<<EOF\
-            Acquire::http { Proxy "http://apt-proxy.neo.futurewei.com:3142"; };\
+            Acquire::http { Proxy "http://10.145.122.118:3142"; };\
             Acquire::https::Proxy "DIRECT";\
             EOF\
             apt-get -y update' $1

diff --git a/test/ete/labs/huawei/onap-openstack-template.env b/test/ete/labs/huawei/onap-openstack-template.env
index ccbbb22..aee61b7 100644 (file)
--- a/test/ete/labs/huawei/onap-openstack-template.env
+++ b/test/ete/labs/huawei/onap-openstack-template.env
@@ -32,7 +32,7 @@ parameters:
 
   nexus_repo: https://nexus.onap.org/content/sites/raw
 
-  nexus_docker_repo: docker-proxy.neo.futurewei.com:5000
+  nexus_docker_repo: 10.145.122.118:5000
 
   nexus_username: anonymous
 
@@ -54,9 +54,9 @@ parameters:
 
   openstack_region: RegionOne
 
-  horizon_url: http://controller.neo.futurewei.com/horizon
+  horizon_url: http://10.145.122.117/horizon
 
-  keystone_url: http://controller.neo.futurewei.com:5000
+  keystone_url: http://10.145.122.117:5000
 
   cloud_env: RegionOne
 
@@ -98,11 +98,11 @@ parameters:
 
   dnsaas_config_enabled: false
   dnsaas_region: RegionOne
-  dnsaas_keystone_url: http://controller.neo.futurewei.com:5000/v3
+  dnsaas_keystone_url: http://10.145.122.117:5000/v3
   dnsaas_tenant_name: ${OS_PROJECT_NAME}
   dnsaas_username: ${OS_USERNAME}
   dnsaas_password: ${OS_PASSWORD}
-  dcae_keystone_url: http://controller.neo.futurewei.com:5000/v2.0
+  dcae_keystone_url: http://10.145.122.117: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