Merge "Maintain independent image version for M.C. plugin"

[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 dc0db55..4df12aa 100644 (file)
--- a/heat/ONAP/onap_openstack_light.yaml
+++ b/heat/ONAP/onap_openstack_light.yaml
@@ -335,6 +335,8 @@ parameters:
     type: string
   mvim_docker:
     type: string
+  mvim_openstack_docker:
+    type: string
   uui_docker:
     type: string
   esr_docker:
@@ -351,6 +353,8 @@ parameters:
     type: string
   nbi_docker:
     type: string
+  dbcl_docker:
+    type: string
 
   vfc_nokia_docker:
     type: string
@@ -873,6 +877,7 @@ resources:
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
             __mr_repo__: { get_param: mr_repo }
+            __dbcl_docker__: { get_param: dbcl_docker }
           template: |
             #!/bin/bash
 
@@ -888,6 +893,7 @@ resources:
             echo "__cloud_env__" > /opt/config/cloud_env.txt
             echo "__external_dns__" > /opt/config/external_dns.txt
             echo "__mr_repo__" > /opt/config/remote_repo.txt
+            echo "__dbcl_docker__" > /opt/config/docker_version.txt
 
             # Download and run install script
             curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/mr_install.sh -o /opt/mr_install.sh
@@ -1590,6 +1596,7 @@ resources:
             __vnfsdk_branch__: { get_param: vnfsdk_branch }
             __msb_docker__: { get_param: msb_docker }
             __mvim_docker__: { get_param: mvim_docker }
+            __mvim_openstack_docker__: { get_param: mvim_openstack_docker }
             __uui_docker__: { get_param: uui_docker }
             __esr_docker__: { get_param: esr_docker }
             __vnfsdk_repo__: { get_param: vnfsdk_repo }
@@ -1630,6 +1637,7 @@ resources:
             echo "__vnfsdk_branch__" > /opt/config/vnfsdk_branch.txt
             echo "__msb_docker__" > /opt/config/msb_docker.txt
             echo "__mvim_docker__" > /opt/config/mvim_docker.txt
+            echo "__mvim_openstack_docker__" > /opt/config/mvim_openstack_docker.txt
             echo "__uui_docker__" > /opt/config/uui_docker.txt
             echo "__esr_docker__" > /opt/config/esr_docker.txt
             echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt
@@ -2026,6 +2034,7 @@ resources:
             __external_dns__: { get_param: external_dns }
             __aaf_repo__: { get_param: aaf_repo }
             __gerrit_branch__: { get_param: aaf_branch }
+            __local_ip__: { get_param: aaf_ip_addr }
           template: |
             #!/bin/bash
 
@@ -2042,6 +2051,7 @@ resources:
             echo "__external_dns__" > /opt/config/external_dns.txt
             echo "__aaf_repo__" > /opt/config/remote_repo.txt
             echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+            echo "__local_ip__" > /opt/config/local_ip.txt
 
             # Download and run install script
             curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aaf_install.sh -o /opt/aaf_install.sh