summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNayan Deshmukh <n.deshmukh@samsung.com>2017-06-29 18:52:39 +0900
committerNayan Deshmukh <n.deshmukh@samsung.com>2017-06-29 19:00:13 +0900
commit408e5ba68e74c9c8fe642f6b06a5581a6761a344 (patch)
treee70cb3c862e83dbb265d35b8143a406d7cd2dcbe
parent9b18f4776f62a39e9cc9c7f26562cbbb74c32196 (diff)
avoid hardcoded values
in integration_robot_properties.py Change-Id: I8bd992d7e10dc87077d80506ef8710cb171c6329 Signed-off-by: Nayan Deshmukh <n.deshmukh@samsung.com>
-rw-r--r--boot/robot_vm_init.sh16
-rw-r--r--heat/OpenECOMP/onap_openstack.yaml24
-rw-r--r--heat/OpenECOMP/onap_openstack_float.yaml24
-rw-r--r--heat/OpenECOMP/onap_openstack_nofloat.yaml24
4 files changed, 88 insertions, 0 deletions
diff --git a/boot/robot_vm_init.sh b/boot/robot_vm_init.sh
index 569f5da0..38c07667 100644
--- a/boot/robot_vm_init.sh
+++ b/boot/robot_vm_init.sh
@@ -5,6 +5,7 @@ NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt)
NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt)
NEXUS_REPO=$(cat /opt/config/nexus_repo.txt)
DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt)
+CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
#
# Deploy latest robot configuration
@@ -16,6 +17,21 @@ cp vm_config2robot.sh /opt/eteshare/config
cp ete.sh /opt
cp demo.sh /opt
+if [[ $CLOUD_ENV != "rackspace" ]]
+then
+ sed -i "s/10.0.1.1/"$(cat /opt/config/aai1_ip_addr.txt)"/g" /opt/eteshare/config/integration_robot_properties.py
+ sed -i "s/10.0.2.1/"$(cat /opt/config/appc_ip_addr.txt)"/g" /opt/eteshare/config/integration_robot_properties.py
+ sed -i "s/10.0.4.1/"$(cat /opt/config/dcae_ip_addr.txt)"/g" /opt/eteshare/config/integration_robot_properties.py
+ sed -i "s/10.0.5.1/"$(cat /opt/config/mso_ip_addr.txt)"/g" /opt/eteshare/config/integration_robot_properties.py
+ sed -i "s/10.0.11.1/"$(cat /opt/config/mr_ip_addr.txt)"/g" /opt/eteshare/config/integration_robot_properties.py
+ sed -i "s/10.0.6.1/"$(cat /opt/config/policy_ip_addr.txt)"/g" /opt/eteshare/config/integration_robot_properties.py
+ sed -i "s/10.0.9.1/"$(cat /opt/config/portal_ip_addr.txt)"/g" /opt/eteshare/config/integration_robot_properties.py
+ sed -i "s/10.0.3.1/"$(cat /opt/config/sdc_ip_addr.txt)"/g" /opt/eteshare/config/integration_robot_properties.py
+ sed -i "s/10.0.7.1/"$(cat /opt/config/sdnc_ip_addr.txt)"/g" /opt/eteshare/config/integration_robot_properties.py
+ sed -i "s/10.0.8.1/"$(cat /opt/config/vid_ip_addr.txt)"/g" /opt/eteshare/config/integration_robot_properties.py
+ sed -i "s/https:\/\/identity.api.rackspacecloud.com/"$(cat /opt/config/keystone.txt)"/g" /opt/eteshare/config/integration_robot_properties.py
+fi
+
chmod +x /opt/ete.sh
chmod +x /opt/demo.sh
diff --git a/heat/OpenECOMP/onap_openstack.yaml b/heat/OpenECOMP/onap_openstack.yaml
index 0a952dff..3929db9f 100644
--- a/heat/OpenECOMP/onap_openstack.yaml
+++ b/heat/OpenECOMP/onap_openstack.yaml
@@ -726,6 +726,18 @@ resources:
__docker_version__: { get_param: docker_version }
__gerrit_branch__: { get_param: gerrit_branch }
__cloud_env__: { get_param: cloud_env }
+ __keystone_url__: { get_param: keystone_url }
+ __aai1_ip_addr__: { get_param: aai1_ip_addr }
+ __aai2_ip_addr__: { get_param: aai2_ip_addr }
+ __appc_ip_addr__: { get_param: appc_ip_addr }
+ __dcae_ip_addr__: { get_param: dcae_ip_addr }
+ __mso_ip_addr__: { get_param: mso_ip_addr }
+ __mr_ip_addr__: { get_param: mr_ip_addr }
+ __policy_ip_addr__: { get_param: policy_ip_addr }
+ __portal_ip_addr__: { get_param: portal_ip_addr }
+ __sdc_ip_addr__: { get_param: sdc_ip_addr }
+ __sdnc_ip_addr__: { get_param: sdnc_ip_addr }
+ __vid_ip_addr__: { get_param: vid_ip_addr }
__external_dns__: { get_param: external_dns }
template: |
#!/bin/bash
@@ -744,6 +756,18 @@ resources:
echo "__docker_version__" > /opt/config/docker_version.txt
echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+ echo "__keystone_url__" > /opt/config/keystone.txt
+ echo "__aai1_ip_addr__" > /opt/config/aai1_ip_addr.txt
+ echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt
+ echo "__appc_ip_addr__" > /opt/config/appc_ip_addr.txt
+ echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt
+ echo "__mso_ip_addr__" > /opt/config/mso_ip_addr.txt
+ echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
+ echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt
+ echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt
+ echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
+ echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt
+ echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt
echo "__cloud_env__" > /opt/config/cloud_env.txt
echo "__external_dns__" > /opt/config/external_dns.txt
diff --git a/heat/OpenECOMP/onap_openstack_float.yaml b/heat/OpenECOMP/onap_openstack_float.yaml
index eff4cc8e..2ba23220 100644
--- a/heat/OpenECOMP/onap_openstack_float.yaml
+++ b/heat/OpenECOMP/onap_openstack_float.yaml
@@ -815,6 +815,18 @@ resources:
__dns_ip_addr__: { get_param: dns_ip_addr }
__docker_version__: { get_param: docker_version }
__gerrit_branch__: { get_param: gerrit_branch }
+ __keystone_url__: { get_param: keystone_url }
+ __aai1_ip_addr__: { get_param: aai1_ip_addr }
+ __aai2_ip_addr__: { get_param: aai2_ip_addr }
+ __appc_ip_addr__: { get_param: appc_ip_addr }
+ __dcae_ip_addr__: { get_param: dcae_ip_addr }
+ __mso_ip_addr__: { get_param: mso_ip_addr }
+ __mr_ip_addr__: { get_param: mr_ip_addr }
+ __policy_ip_addr__: { get_param: policy_ip_addr }
+ __portal_ip_addr__: { get_param: portal_ip_addr }
+ __sdc_ip_addr__: { get_param: sdc_ip_addr }
+ __sdnc_ip_addr__: { get_param: sdnc_ip_addr }
+ __vid_ip_addr__: { get_param: vid_ip_addr }
__cloud_env__: { get_param: cloud_env }
__external_dns__: { get_param: external_dns }
template: |
@@ -834,6 +846,18 @@ resources:
echo "__docker_version__" > /opt/config/docker_version.txt
echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+ echo "__keystone_url__" > /opt/config/keystone.txt
+ echo "__aai1_ip_addr__" > /opt/config/aai1_ip_addr.txt
+ echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt
+ echo "__appc_ip_addr__" > /opt/config/appc_ip_addr.txt
+ echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt
+ echo "__mso_ip_addr__" > /opt/config/mso_ip_addr.txt
+ echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
+ echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt
+ echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt
+ echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
+ echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt
+ echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt
echo "__cloud_env__" > /opt/config/cloud_env.txt
echo "__external_dns__" > /opt/config/external_dns.txt
diff --git a/heat/OpenECOMP/onap_openstack_nofloat.yaml b/heat/OpenECOMP/onap_openstack_nofloat.yaml
index 41f20222..a5b7f814 100644
--- a/heat/OpenECOMP/onap_openstack_nofloat.yaml
+++ b/heat/OpenECOMP/onap_openstack_nofloat.yaml
@@ -696,6 +696,18 @@ resources:
__oam_network_cidr__: { get_param: oam_network_cidr }
__docker_version__: { get_param: docker_version }
__gerrit_branch__: { get_param: gerrit_branch }
+ __keystone_url__: { get_param: keystone_url }
+ __aai1_ip_addr__: { get_param: aai1_ip_addr }
+ __aai2_ip_addr__: { get_param: aai2_ip_addr }
+ __appc_ip_addr__: { get_param: appc_ip_addr }
+ __dcae_ip_addr__: { get_param: dcae_ip_addr }
+ __mso_ip_addr__: { get_param: mso_ip_addr }
+ __mr_ip_addr__: { get_param: mr_ip_addr }
+ __policy_ip_addr__: { get_param: policy_ip_addr }
+ __portal_ip_addr__: { get_param: portal_ip_addr }
+ __sdc_ip_addr__: { get_param: sdc_ip_addr }
+ __sdnc_ip_addr__: { get_param: sdnc_ip_addr }
+ __vid_ip_addr__: { get_param: vid_ip_addr }
__cloud_env__: { get_param: cloud_env }
__external_dns__: { get_param: external_dns }
template: |
@@ -717,6 +729,18 @@ resources:
echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+ echo "__keystone_url__" > /opt/config/keystone.txt
+ echo "__aai1_ip_addr__" > /opt/config/aai1_ip_addr.txt
+ echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt
+ echo "__appc_ip_addr__" > /opt/config/appc_ip_addr.txt
+ echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt
+ echo "__mso_ip_addr__" > /opt/config/mso_ip_addr.txt
+ echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
+ echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt
+ echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt
+ echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
+ echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt
+ echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt
echo "__cloud_env__" > /opt/config/cloud_env.txt
echo "__external_dns__" > /opt/config/external_dns.txt