Merge "Install MUSIC containers via Heat"

6 files changed, 28 insertions, 1 deletions

diff --git a/boot/music_install.sh b/boot/music_install.sh
index 6965b957..759a9389 100644
--- a/boot/music_install.sh
+++ b/boot/music_install.sh
@@ -5,7 +5,9 @@ NEXUS_REPO=$(cat /opt/config/nexus_repo.txt)
 ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt)
 DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt)
 CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
+GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
 MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
+CODE_REPO=$(cat /opt/config/remote_repo.txt)
 
 # Add host name to /etc/host to avoid warnings in openstack images
 if [[ $CLOUD_ENV != "rackspace" ]]
@@ -91,4 +93,5 @@ resolvconf -u
 
 # Clone Gerrit repository and run docker containers
 cd /opt
+git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO
 ./music_vm_init.sh
\ No newline at end of file
diff --git a/boot/music_vm_init.sh b/boot/music_vm_init.sh
index b18aa998..b1aa8fe0 100644
--- a/boot/music_vm_init.sh
+++ b/boot/music_vm_init.sh
@@ -10,4 +10,8 @@ docker pull library/tomcat:8.5
 
 docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
 docker pull $NEXUS_DOCKER_REPO/onap/music/Cassandra:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/music/music:$DOCKER_IMAGE_VERSION
\ No newline at end of file
+docker pull $NEXUS_DOCKER_REPO/onap/music/music:$DOCKER_IMAGE_VERSION
+
+cd /opt/music/distribution/dockermusic
+git pull
+./music.sh start
\ No newline at end of file
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 1db5408d..d252044d 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -132,6 +132,7 @@ parameters:
   vid_branch: master
   clamp_branch: master
   vnfsdk_branch: master
+  music_branch: master
 
   aai_docker: 1.2-STAGING-latest
   aai_sparky_docker: 1.2-STAGING-latest
@@ -201,3 +202,4 @@ parameters:
   vid_repo: http://gerrit.onap.org/r/vid.git
   clamp_repo: http://gerrit.onap.org/r/clamp.git
   vnfsdk_repo: http://gerrit.onap.org/r/vnfsdk/refrepo.git
+  music_repo: http://gerrit.onap.org/r/music.git
\ No newline at end of file
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 12c466a6..b29218d5 100644
--- 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
 
   ################################
   #                              #
@@ -412,6 +414,8 @@ parameters:
     type: string
   vnfsdk_branch:
     type: string
+  music_branch:
+    type: string
 
 
 #############
@@ -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
 
diff --git a/heat/ONAP/onap_openstack_light.yaml b/heat/ONAP/onap_openstack_light.yaml
index 8e2b2f76..b530cfa7 100644
--- a/heat/ONAP/onap_openstack_light.yaml
+++ b/heat/ONAP/onap_openstack_light.yaml
@@ -290,6 +290,8 @@ parameters:
     type: string
   vnfsdk_repo:
     type: string
+  music_repo:
+    type: string
 
   ################################
   #                              #
@@ -406,6 +408,8 @@ parameters:
     type: string
   vnfsdk_branch:
     type: string
+  music_branch:
+    type: string
 
 
 #############
@@ -1865,6 +1869,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: |
@@ -1879,6 +1885,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
 
diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index 233cd869..5bbd9ab4 100644
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -132,6 +132,7 @@ parameters:
   vid_branch: master
   clamp_branch: master
   vnfsdk_branch: master
+  music_branch: master
 
   aai_docker: ${AAI_RESOURCES_DOCKER}
   aai_sparky_docker: ${AAI_RESOURCES_DOCKER}
@@ -201,3 +202,4 @@ parameters:
   vid_repo: http://gerrit.onap.org/r/vid.git
   clamp_repo: http://gerrit.onap.org/r/clamp.git
   vnfsdk_repo: http://gerrit.onap.org/r/vnfsdk/refrepo.git
+  music_repo: http://gerrit.onap.org/r/music.git