summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2018-04-17 13:09:41 +0000
committerGerrit Code Review <gerrit@onap.org>2018-04-17 13:09:41 +0000
commitc7568d108813e95161412d907145721fedb6470c (patch)
treecc02015ce6c973b341e9c515bf56436b6e6bb966
parent2f043bb68ceba4d73255bb775a46579ddac1ef3c (diff)
parent36380716dfb4fb277efee2edadcce51bb85e0121 (diff)
Merge "modify robot_vm for nbi ip Issue-ID: INT-456"
-rw-r--r--heat/ONAP/onap_openstack.yaml2
-rw-r--r--heat/ONAP/onap_openstack_light.yaml2
2 files changed, 4 insertions, 0 deletions
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 3ccdab94..1038e326 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -1033,6 +1033,7 @@ resources:
__music_ip_addr__: { get_param: music_ip_addr }
__oof_ip_addr__: { get_param: oof_ip_addr }
__aaf_ip_addr__: { get_param: aaf_ip_addr }
+ __nbi_ip_addr__: { get_param: nbi_ip_addr }
__external_dns__: { get_param: external_dns }
__ubuntu_1404_image__: { get_param: ubuntu_1404_image }
__ubuntu_1604_image__: { get_param: ubuntu_1604_image }
@@ -1079,6 +1080,7 @@ resources:
echo "__music_ip_addr__" > /opt/config/music_ip_addr.txt
echo "__oof_ip_addr__" > /opt/config/oof_ip_addr.txt
echo "__aaf_ip_addr__" > /opt/config/aaf_ip_addr.txt
+ echo "__nbi_ip_addr__" > /opt/config/nbi_ip_addr.txt
echo "__cloud_env__" > /opt/config/cloud_env.txt
echo "__external_dns__" > /opt/config/external_dns.txt
echo "__vm_flavor__" > /opt/config/vm_flavor.txt
diff --git a/heat/ONAP/onap_openstack_light.yaml b/heat/ONAP/onap_openstack_light.yaml
index 79fffad9..0a6c4df0 100644
--- a/heat/ONAP/onap_openstack_light.yaml
+++ b/heat/ONAP/onap_openstack_light.yaml
@@ -954,6 +954,7 @@ resources:
__clamp_ip_addr__: { get_param: clamp_ip_addr }
__openo_ip_addr__: { get_param: openo_ip_addr }
__music_ip_addr__: { get_param: music_ip_addr }
+ __nbi_ip_addr__: { get_param: nbi_ip_addr }
__external_dns__: { get_param: external_dns }
__vm_image_name__: { get_param: ubuntu_1404_image }
__vm_flavor__: { get_param: flavor_medium }
@@ -996,6 +997,7 @@ resources:
echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt
echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt
echo "__music_ip_addr__" > /opt/config/music_ip_addr.txt
+ echo "__nbi_ip_addr__" > /opt/config/nbi_ip_addr.txt
echo "__oof_ip_addr__" > /opt/config/oof_ip_addr.txt
echo "__aaf_ip_addr__" > /opt/config/aaf_ip_addr.txt
echo "__cloud_env__" > /opt/config/cloud_env.txt