Merge "Register WF Designer UI Service to MSB"

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

diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index d956162..b29218d 100644 (file)
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -294,6 +294,8 @@ parameters:
     type: string
   vnfsdk_repo:
     type: string
+  music_repo:
+    type: string
 
   ################################
   #                              #
@@ -378,8 +380,6 @@ parameters:
     type: string
   vfc_wfengine_activiti_docker:
     type: string
-  vfc_ztevmanagerdriver_docker:
-    type: string
   vfc_multivimproxy_docker:
     type: string
 
@@ -414,6 +414,8 @@ parameters:
     type: string
   vnfsdk_branch:
     type: string
+  music_branch:
+    type: string
 
 
 #############
@@ -1587,6 +1589,7 @@ resources:
             __cbam_username__: { get_param: cbam_username }
             __cbam_password__: { get_param: cbam_password }
             __vfc_ztevnfmdriver_docker__: { get_param: vfc_ztevnfmdriver_docker }
+            __vfc_multivimproxy_docker__: { get_param: vfc_multivimproxy_docker }
             __vfc_ztesdncdriver_docker__: { get_param: vfc_ztesdncdriver_docker }
             __vfc_vnfres_docker__: { get_param: vfc_vnfres_docker }
             __vfc_vnfmgr_docker__: { get_param: vfc_vnfmgr_docker }
@@ -1626,6 +1629,7 @@ resources:
 
             echo "export NOKIA_DOCKER_VER=__vfc_nokia_docker__" >> /opt/config/vfc_docker.txt
             echo "export NOKIAV2_DOCKER_VER=__vfc_nokiav2_docker__" >> /opt/config/vfc_docker.txt
+            echo "export MULTIVIMPROXY_DOCKER_VER=__vfc_multivimproxy_docker__" >> /opt/config/vfc_docker.txt
             echo "export ZTEVNFMDRIVER_DOCKER_VER=__vfc_ztevnfmdriver_docker__" >> /opt/config/vfc_docker.txt
             echo "export ZTESDNCDRIVER_DOCKER_VER=__vfc_ztesdncdriver_docker__" >> /opt/config/vfc_docker.txt
             echo "export VNFRES_DOCKER_VER=__vfc_vnfres_docker__" >> /opt/config/vfc_docker.txt
@@ -1877,6 +1881,8 @@ resources:
             __artifacts_version__: { get_param: artifacts_version }
             __dns_ip_addr__: { get_param: dns_ip_addr }
             __docker_version__: { get_param: music_docker }
+            __music_repo__: { get_param: music_repo }
+            __gerrit_branch__: { get_param: music_branch }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
           template: |
@@ -1891,6 +1897,8 @@ resources:
             echo "__artifacts_version__" > /opt/config/artifacts_version.txt
             echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
             echo "__docker_version__" > /opt/config/docker_version.txt
+            echo "__music_repo__" > /opt/config/remote_repo.txt
+            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt
             echo "__external_dns__" > /opt/config/external_dns.txt
 
@@ -1919,8 +1927,8 @@ resources:
   oof_vm:
     type: OS::Nova::Server
     properties:
-      image: { get_param: ubuntu_1404_image }
-      flavor: { get_param: flavor_medium }
+      image: { get_param: ubuntu_1604_image }
+      flavor: { get_param: flavor_large }
       name:
         str_replace:
           template: base-oof