Update lab RC files
Change-Id: Ie50b3c75047f1dac0af471e46c04ecd02c0dee82
Issue-ID: INT-532
Signed-off-by: gwu <gary.i.wu@huawei.com>
diff --git a/deployment/heat/onap-oom/env/gwu/onap-heat-openrc b/deployment/heat/onap-oom/env/gwu/onap-heat-openrc
new file mode 100644
index 0000000..c28e378
--- /dev/null
+++ b/deployment/heat/onap-oom/env/gwu/onap-heat-openrc
@@ -0,0 +1,9 @@
+export OS_PROJECT_DOMAIN_NAME=Default
+export OS_USER_DOMAIN_NAME=Default
+export OS_PROJECT_ID=7504c113f3b241fab1ee9d3d9323f6c1
+export OS_PROJECT_NAME=onap-heat
+export OS_USERNAME=demo
+#export OS_PASSWORD=demo
+export OS_AUTH_URL=http://controller:5000/v3
+export OS_IDENTITY_API_VERSION=3
+export OS_IMAGE_API_VERSION=2
diff --git a/deployment/heat/onap-oom/env/gwu/onap.env b/deployment/heat/onap-oom/env/gwu/onap-heat.env
similarity index 92%
rename from deployment/heat/onap-oom/env/gwu/onap.env
rename to deployment/heat/onap-oom/env/gwu/onap-heat.env
index efc263e..07ac9c1 100644
--- a/deployment/heat/onap-oom/env/gwu/onap.env
+++ b/deployment/heat/onap-oom/env/gwu/onap-heat.env
@@ -3,12 +3,13 @@
ubuntu_1604_image: xenial
apt_proxy: 192.168.1.51:3142
- docker_proxy: 192.168.1.51:5000
+ docker_proxy: 192.168.2.20:5000
rancher_vm_flavor: m1.xlarge
k8s_vm_flavor: m1.xlarge
- public_net_id: 024582bd-ef9b-48b9-9e70-e6732559d9df
+ public_net_id: bfd766f4-ccb5-4d14-944a-fcf1a94a824c
+ key_name: onap-key
oam_network_cidr: 10.0.0.0/16
diff --git a/deployment/heat/onap-oom/env/gwu/onap-oom-openrc b/deployment/heat/onap-oom/env/gwu/onap-oom-openrc
new file mode 100644
index 0000000..d11ead4
--- /dev/null
+++ b/deployment/heat/onap-oom/env/gwu/onap-oom-openrc
@@ -0,0 +1,9 @@
+export OS_PROJECT_DOMAIN_NAME=Default
+export OS_USER_DOMAIN_NAME=Default
+export OS_PROJECT_ID=6d39557690ff4bc18372d0ca6c0e3d82
+export OS_PROJECT_NAME=onap-oom
+export OS_USERNAME=demo
+#export OS_PASSWORD=demo
+export OS_AUTH_URL=http://controller:5000/v3
+export OS_IDENTITY_API_VERSION=3
+export OS_IMAGE_API_VERSION=2
diff --git a/deployment/heat/onap-oom/env/gwu/onap.env b/deployment/heat/onap-oom/env/gwu/onap-oom.env
similarity index 92%
copy from deployment/heat/onap-oom/env/gwu/onap.env
copy to deployment/heat/onap-oom/env/gwu/onap-oom.env
index efc263e..07ac9c1 100644
--- a/deployment/heat/onap-oom/env/gwu/onap.env
+++ b/deployment/heat/onap-oom/env/gwu/onap-oom.env
@@ -3,12 +3,13 @@
ubuntu_1604_image: xenial
apt_proxy: 192.168.1.51:3142
- docker_proxy: 192.168.1.51:5000
+ docker_proxy: 192.168.2.20:5000
rancher_vm_flavor: m1.xlarge
k8s_vm_flavor: m1.xlarge
- public_net_id: 024582bd-ef9b-48b9-9e70-e6732559d9df
+ public_net_id: bfd766f4-ccb5-4d14-944a-fcf1a94a824c
+ key_name: onap-key
oam_network_cidr: 10.0.0.0/16
diff --git a/deployment/heat/onap-oom/env/gwu/onap-openrc b/deployment/heat/onap-oom/env/gwu/onap-openrc
deleted file mode 120000
index c08bcbd..0000000
--- a/deployment/heat/onap-oom/env/gwu/onap-openrc
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../test/ete/labs/gwu/onap-openrc
\ No newline at end of file
diff --git a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom-openrc b/deployment/heat/onap-oom/env/huawei/onap-beijing-oom-openrc
deleted file mode 120000
index 38d9b3f..0000000
--- a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom-openrc
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../test/ete/labs/huawei/onap-beijing-oom-openrc
\ No newline at end of file
diff --git a/deployment/heat/onap-oom/env/huawei/onap-heat-openrc b/deployment/heat/onap-oom/env/huawei/onap-heat-openrc
new file mode 100644
index 0000000..301aeee
--- /dev/null
+++ b/deployment/heat/onap-oom/env/huawei/onap-heat-openrc
@@ -0,0 +1,9 @@
+export OS_PROJECT_DOMAIN_NAME=Default
+export OS_USER_DOMAIN_NAME=Default
+export OS_PROJECT_ID=66a48e4b0a934463bef0bd694f93147a
+export OS_PROJECT_NAME=onap-heat
+export OS_USERNAME=demo
+#export OS_PASSWORD=demo
+export OS_AUTH_URL=http://controller.neo.futurewei.com:5000/v3
+export OS_IDENTITY_API_VERSION=3
+export OS_IMAGE_API_VERSION=2
diff --git a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env b/deployment/heat/onap-oom/env/huawei/onap-heat.env
similarity index 83%
rename from deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env
rename to deployment/heat/onap-oom/env/huawei/onap-heat.env
index f50d85a..d4d82e7 100644
--- a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env
+++ b/deployment/heat/onap-oom/env/huawei/onap-heat.env
@@ -2,13 +2,14 @@
ubuntu_1604_image: xenial
- apt_proxy: 10.145.122.118:3142
- docker_proxy: 10.145.122.118:5000
+ apt_proxy: 10.145.122.117:8000
+ docker_proxy: 10.145.123.23:5000
rancher_vm_flavor: m1.xlarge
k8s_vm_flavor: m1.xlarge
- public_net_id: 3a6247f1-fac6-4167-a49f-33cc8415ccf4
+ public_net_id: 7baa99ac-43a0-4013-9dfb-bbb94fdcd91a
+ key_name: onap-key
oam_network_cidr: 10.0.0.0/16
@@ -17,7 +18,7 @@
repository: 10.145.122.118:5000
pullPolicy: IfNotPresent
robot:
- openStackKeyStoneUrl: "http://10.145.122.117:5000"
+ openStackKeyStoneUrl: "http://10.145.122.118:5000"
openStackPublicNetId: "3a6247f1-fac6-4167-a49f-33cc8415ccf4"
openStackPassword: "${OS_PASSWORD}"
openStackTenantId: "${OS_PROJECT_ID}"
@@ -33,7 +34,7 @@
so:
config:
openStackUserName: "${OS_USERNAME}"
- openStackKeyStoneUrl: "http://10.145.122.117:5000"
+ openStackKeyStoneUrl: "http://10.145.122.118:5000"
openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
appc:
replicaCount: 3
diff --git a/deployment/heat/onap-oom/env/huawei/onap-oom-openrc b/deployment/heat/onap-oom/env/huawei/onap-oom-openrc
new file mode 100644
index 0000000..cdafe23
--- /dev/null
+++ b/deployment/heat/onap-oom/env/huawei/onap-oom-openrc
@@ -0,0 +1,9 @@
+export OS_PROJECT_DOMAIN_NAME=Default
+export OS_USER_DOMAIN_NAME=Default
+export OS_PROJECT_ID=13159ba149fa47ea9646902ce5734b89
+export OS_PROJECT_NAME=onap-oom
+export OS_USERNAME=demo
+#export OS_PASSWORD=demo
+export OS_AUTH_URL=http://controller.neo.futurewei.com:5000/v3
+export OS_IDENTITY_API_VERSION=3
+export OS_IMAGE_API_VERSION=2
diff --git a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env b/deployment/heat/onap-oom/env/huawei/onap-oom.env
similarity index 83%
copy from deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env
copy to deployment/heat/onap-oom/env/huawei/onap-oom.env
index f50d85a..d4d82e7 100644
--- a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env
+++ b/deployment/heat/onap-oom/env/huawei/onap-oom.env
@@ -2,13 +2,14 @@
ubuntu_1604_image: xenial
- apt_proxy: 10.145.122.118:3142
- docker_proxy: 10.145.122.118:5000
+ apt_proxy: 10.145.122.117:8000
+ docker_proxy: 10.145.123.23:5000
rancher_vm_flavor: m1.xlarge
k8s_vm_flavor: m1.xlarge
- public_net_id: 3a6247f1-fac6-4167-a49f-33cc8415ccf4
+ public_net_id: 7baa99ac-43a0-4013-9dfb-bbb94fdcd91a
+ key_name: onap-key
oam_network_cidr: 10.0.0.0/16
@@ -17,7 +18,7 @@
repository: 10.145.122.118:5000
pullPolicy: IfNotPresent
robot:
- openStackKeyStoneUrl: "http://10.145.122.117:5000"
+ openStackKeyStoneUrl: "http://10.145.122.118:5000"
openStackPublicNetId: "3a6247f1-fac6-4167-a49f-33cc8415ccf4"
openStackPassword: "${OS_PASSWORD}"
openStackTenantId: "${OS_PROJECT_ID}"
@@ -33,7 +34,7 @@
so:
config:
openStackUserName: "${OS_USERNAME}"
- openStackKeyStoneUrl: "http://10.145.122.117:5000"
+ openStackKeyStoneUrl: "http://10.145.122.118:5000"
openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
appc:
replicaCount: 3