From: Dileep Ranganathan <dileep.ranganathan@intel.com>
Date: Wed, 6 Jun 2018 18:58:14 +0000 (-0700)
Subject: Replace docker version tags for OOF
X-Git-Tag: v1.2.1~4
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=demo.git;a=commitdiff_plain;h=3f5434179d1721dc8f201b687910e9193ff38622

Replace docker version tags for OOF

Replace docker version tags to read from HEAT template

Change-Id: Iacdaa2956e1a7a889cd00f440d81d248f56337af
Issue-ID: OPTFRA-257
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---

diff --git a/boot/oof_vm_init.sh b/boot/oof_vm_init.sh
index 7c1f2cc7..fd654430 100644
--- a/boot/oof_vm_init.sh
+++ b/boot/oof_vm_init.sh
@@ -7,7 +7,10 @@ BUNDLE=/opt/optf-has/AAF_RootCA.cer
 NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt)
 NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt)
 NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt)
-DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt)
+CASS_MUSIC_IMAGE_VERSION=$(cat /opt/config/cass_version.txt)
+MUSIC_IMAGE_VERSION=$(cat /opt/config/music_version.txt)
+HAS_IMAGE_VERSION=$(cat /opt/config/has_docker_version.txt)
+OSDF_IMAGE_VERSION=$(cat /opt/config/osdf_docker_version.txt)
 
 cd /opt/optf-has
 git pull
@@ -18,11 +21,12 @@ LOG_CONF=/opt/optf-has/log.conf
 #!!! THE FOLLOWING LINE IS A PLACEHOLDER !!!
 AAI_cert=/usr/local/bin/AAF_RootCA.cer
 
-IMAGE_NAME="$NEXUS_DOCKER_REPO/onap/optf-has"
+OSDF_IMG=${NEXUS_DOCKER_REPO}/onap/optf-osdf:${OSDF_IMAGE_VERSION}
+HAS_IMG=${NEXUS_DOCKER_REPO}/onap/optf-has:${HAS_IMAGE_VERSION}
 
 # MUSIC parameters
-CASS_IMG=${NEXUS_DOCKER_REPO}/onap/music/cassandra_music:latest
-MUSIC_IMG=${NEXUS_DOCKER_REPO}/onap/music/music:latest
+CASS_IMG=${NEXUS_DOCKER_REPO}/onap/music/cassandra_music:$CASS_MUSIC_IMAGE_VERSION
+MUSIC_IMG=${NEXUS_DOCKER_REPO}/onap/music/music:$MUSIC_IMAGE_VERSION
 TOMCAT_IMG=library/tomcat:8.5
 ZK_IMG=library/zookeeper:3.4
 WORK_DIR=/opt/optf-has
@@ -31,17 +35,16 @@ CASS_PASSWORD=cassandra1
 
 # pull images from repo
 docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-docker pull $NEXUS_DOCKER_REPO/onap/optf-osdf:$DOCKER_IMAGE_VERSION
+docker pull ${OSDF_IMG}
 docker pull ${ZK_IMG}
 docker pull ${TOMCAT_IMG}
 docker pull ${CASS_IMG}
 docker pull ${MUSIC_IMG}
-docker pull $NEXUS_DOCKER_REPO/onap/optf-has:$DOCKER_IMAGE_VERSION
+docker pull ${HAS_IMG}
 
 
 #run optf-osdf
 
-OSDF_IMAGE_NAME="$NEXUS_DOCKER_REPO/onap/optf-osdf"
 OSDF_CONFIG=/opt/optf-osdf/config/osdf_config.yaml
 HAS_HOST=$(docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' api)
 
@@ -94,7 +97,7 @@ osdfCMSchedulerPassword: testpwd1
 
 NEWFILE
 
-docker run -d --name osdf -v $OSDF_CONFIG:/opt/app/config/osdf_config.yaml -p 8698:8699 ${OSDF_IMAGE_NAME}:latest
+docker run -d --name osdf -v $OSDF_CONFIG:/opt/app/config/osdf_config.yaml -p 8698:8699 ${OSDF_IMG}
 
 # install MUSIC
 # create directory for music properties and logs
@@ -186,15 +189,15 @@ echo $KEY
 echo $BUNDLE
 
 # run optf-has
-docker run -d --name controller -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${IMAGE_NAME}:latest python /usr/local/bin/conductor-controller --config-file=/usr/local/bin/conductor.conf
+docker run -d --name controller -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${HAS_IMG} python /usr/local/bin/conductor-controller --config-file=/usr/local/bin/conductor.conf
 
-docker run -d --name api -p "8091:8091" -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${IMAGE_NAME}:latest python /usr/local/bin/conductor-api --port=8091 -- --config-file=/usr/local/bin/conductor.conf
+docker run -d --name api -p "8091:8091" -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${HAS_IMG} python /usr/local/bin/conductor-api --port=8091 -- --config-file=/usr/local/bin/conductor.conf
 
-docker run -d --name solver -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${IMAGE_NAME}:latest python /usr/local/bin/conductor-solver --config-file=/usr/local/bin/conductor.conf
+docker run -d --name solver -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${HAS_IMG} python /usr/local/bin/conductor-solver --config-file=/usr/local/bin/conductor.conf
 
-docker run -d --name reservation -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${IMAGE_NAME}:latest python /usr/local/bin/conductor-reservation --config-file=/usr/local/bin/conductor.conf
+docker run -d --name reservation -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${HAS_IMG} python /usr/local/bin/conductor-reservation --config-file=/usr/local/bin/conductor.conf
 
-docker run -d --name data -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf -v $CERT:/usr/local/bin/aai_cert.cer -v $KEY:/usr/local/bin/aai_key.key -v $BUNDLE:/usr/local/bin/AAF_RootCA.cer ${IMAGE_NAME}:latest python /usr/local/bin/conductor-data --config-file=/usr/local/bin/conductor.conf
+docker run -d --name data -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf -v $CERT:/usr/local/bin/aai_cert.cer -v $KEY:/usr/local/bin/aai_key.key -v $BUNDLE:/usr/local/bin/AAF_RootCA.cer ${HAS_IMG} python /usr/local/bin/conductor-data --config-file=/usr/local/bin/conductor.conf
 
 sleep 10
 
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 39bbc8ec..16894ea1 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -143,7 +143,9 @@ parameters:
   dgbuilder_docker: 0.2.4
   cli_docker: 2.0.2
   music_docker: 2.5.3
-  oof_docker: 1.1.1
+  cassandra_music_docker: 3.0.0
+  optf_has_docker: 1.1.1
+  optf_osdf_docker: 1.1.1
   aaf_docker: 2.1.1
   sms_docker: 2.0.0
   nbi_docker: 2.0.0
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 45b6523b..98848c4f 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -438,7 +438,11 @@ parameters:
     type: string
   music_docker:
     type: string
-  oof_docker:
+  cassandra_music_docker:
+    type: string
+  optf_has_docker:
+    type: string
+  optf_osdf_docker:
     type: string
   aaf_docker:
     type: string
@@ -2164,7 +2168,10 @@ resources:
             __nexus_password__: { get_param: nexus_password }
             __artifacts_version__: { get_param: artifacts_version }
             __dns_ip_addr__: { get_param: dns_ip_addr }
-            __docker_version__: { get_param: oof_docker }
+            __has_docker_version__: { get_param: optf_has_docker }
+            __osdf_docker_version__: { get_param: optf_osdf_docker }
+            __music_docker_version__: { get_param: music_docker }
+            __cass_music_docker_version__: { get_param: cassandra_music_docker }
             __oof_repo__: { get_param: oof_repo }
             __gerrit_branch__: { get_param: oof_branch }
             __cloud_env__: { get_param: cloud_env }
@@ -2180,7 +2187,10 @@ resources:
             echo "__nexus_password__" > /opt/config/nexus_password.txt
             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 "__has_docker_version__" > /opt/config/has_docker_version.txt
+            echo "__osdf_docker_version__" > /opt/config/osdf_docker_version.txt
+            echo "__music_docker_version__" > /opt/config/music_version.txt
+            echo "__cass_music_docker_version__" > /opt/config/cass_version.txt
             echo "__oof_repo__" > /opt/config/remote_repo.txt
             echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt
diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index 16c94d2a..33785861 100644
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -143,7 +143,9 @@ parameters:
   dgbuilder_docker: ${CCSDK_DGBUILDER_IMAGE_DOCKER}
   cli_docker: ${CLI_DOCKER}
   music_docker: ${MUSIC_DOCKER}
-  oof_docker: ${OPTF_OSDF_DOCKER}
+  cassandra_music_docker: ${CASSANDRA_MUSIC_DOCKER}
+  optf_has_docker: ${OPTF_HAS_DOCKER}
+  optf_osdf_docker: ${OPTF_OSDF_DOCKER}
   aaf_docker: ${AAF_SERVICE_DOCKER}
   sms_docker: ${SMS_DOCKER}
   nbi_docker: ${NBI_DOCKER}