From: Gary Wu <gary.i.wu@huawei.com>
Date: Fri, 12 Jan 2018 23:12:06 +0000 (-0800)
Subject: Update lab environment configuration
X-Git-Tag: 1.0.1-Amsterdam~9
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=70bcc2f9c7d60f9f4b838665aa93898639f83a28;p=integration.git

Update lab environment configuration

Change-Id: I896b74b9e5e734b4beb35130f32709c9b5ee3ac8
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 59ba676a3..200d1d0f4 100755
--- 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" : ["docker-proxy.local.enacct.com:5000"]\
+              "insecure-registries" : ["force.local.enacct.com:5000"]\
             }\
             EOF\
             cat > /etc/apt/apt.conf.d/30proxy<<EOF\
-            Acquire::http { Proxy "http://stack.local.enacct.com:3142"; };\
+            Acquire::http { Proxy "http://force.local.enacct.com:3142"; };\
             Acquire::https::Proxy "DIRECT";\
             EOF\
             apt-get -y update' $1
diff --git a/test/ete/labs/gwu/onap-openrc b/test/ete/labs/gwu/onap-openrc
index 74042317b..bc05c8acd 100644
--- a/test/ete/labs/gwu/onap-openrc
+++ b/test/ete/labs/gwu/onap-openrc
@@ -1,6 +1,6 @@
-export OS_PROJECT_ID=fe370564c0614739a328e20d8ae76261
 export OS_PROJECT_DOMAIN_NAME=Default
 export OS_USER_DOMAIN_NAME=Default
+export OS_PROJECT_ID=4c93f99551604bf7af25a8f80c7f34cb
 export OS_PROJECT_NAME=onap
 export OS_USERNAME=demo
 export OS_PASSWORD=demo
diff --git a/test/ete/labs/gwu/onap-openstack-template.env b/test/ete/labs/gwu/onap-openstack-template.env
index b65729070..1849dfdd7 100644
--- a/test/ete/labs/gwu/onap-openstack-template.env
+++ b/test/ete/labs/gwu/onap-openstack-template.env
@@ -6,7 +6,7 @@ parameters:
   #                                            #
   ##############################################
 
-  public_net_id: 50e7638e-a9d2-4cd9-a242-2f289f8f6553
+  public_net_id: 024582bd-ef9b-48b9-9e70-e6732559d9df
 
   public_net_name: provider
 
@@ -32,7 +32,7 @@ parameters:
 
   nexus_repo: https://nexus.onap.org/content/sites/raw
 
-  nexus_docker_repo: docker-proxy.local.enacct.com:5000
+  nexus_docker_repo: force.local.enacct.com:5000
 
   nexus_username: anonymous
 
@@ -54,9 +54,9 @@ parameters:
 
   openstack_region: RegionOne
 
-  horizon_url: http://stack.local.enacct.com/horizon
+  horizon_url: http://controller.local.enacct.com/horizon
 
-  keystone_url: http://stack.local.enacct.com:5000
+  keystone_url: http://controller.local.enacct.com:5000
 
   cloud_env: RegionOne