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 b2ad74c..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
 
 #############
 #           #
@@ -1987,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:
@@ -2010,6 +2014,8 @@ resources:
             __docker_version__: { get_param: aaf_docker }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
+            __aaf_repo__: { get_param: aaf_repo }
+            __gerrit_branch__: { get_param: aaf_branch }
           template: |
             #!/bin/bash
 
@@ -2024,6 +2030,8 @@ resources:
             echo "__docker_version__" > /opt/config/docker_version.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt
             echo "__external_dns__" > /opt/config/external_dns.txt
+            echo "__aaf_repo__" > /opt/config/remote_repo.txt
+            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
 
             # Download and run install script
             curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aaf_install.sh -o /opt/aaf_install.sh