Merge "modify robot_vm for nbi ip Issue-ID: INT-456"

[demo.git] / heat / ONAP / onap_openstack_light.yaml

diff --git a/heat/ONAP/onap_openstack_light.yaml b/heat/ONAP/onap_openstack_light.yaml
index 17266b2..0a6c4df 100644 (file)
--- a/heat/ONAP/onap_openstack_light.yaml
+++ b/heat/ONAP/onap_openstack_light.yaml
@@ -294,6 +294,8 @@ parameters:
     type: string
   nbi_repo:
     type: string
+  aaf_repo:
+    type: string
 
   ################################
   #                              #
@@ -416,6 +418,8 @@ parameters:
     type: string
   nbi_branch:
     type: string
+  aaf_branch:
+    type: string
 
 #############
 #           #
@@ -950,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 }
@@ -992,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
@@ -1985,7 +1991,7 @@ resources:
   aaf_vm:
     type: OS::Nova::Server
     properties:
-      image: { get_param: ubuntu_1404_image }
+      image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_medium }
       name:
         str_replace: