From 6f588d5a78f6baabb7c96aebbfd2fcfb443e5802 Mon Sep 17 00:00:00 2001
From: "Christopher Lott (cl778h)" <clott@research.att.com>
Date: Mon, 7 Aug 2017 08:26:05 -0400
Subject: Move hardcoded container tags to variables.

Improve robustness of management scripts:
move image tag name prefixes to os_settings.sh script and use
them in all scripts, also in ONAP boot/portal_vm_init.sh script.

Issue: PORTAL-62
Change-Id: I62bd27f498d65551c70e18dced38de7bc3be016f
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
---
 deliveries/dbstart.sh           |  6 +++---
 deliveries/os_docker_push.sh    | 12 ++++++------
 deliveries/os_docker_release.sh | 12 ++++++------
 deliveries/os_settings.sh       | 11 +++++++++--
 4 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/deliveries/dbstart.sh b/deliveries/dbstart.sh
index 518a5485..c76cb391 100755
--- a/deliveries/dbstart.sh
+++ b/deliveries/dbstart.sh
@@ -3,7 +3,7 @@
 # Establish environment variables
 source $(dirname $0)/os_settings.sh
 
-#docker create --name data_vol_portal -v /var/lib/mysql mariadb;
+#docker create --name ${DB_VOL_NAME} -v /var/lib/mysql mariadb;
 
-echo "Running docker image ${DB_IMG_NAME} as name ${DB_CONT_NAME}"
-docker run -d --volumes-from data_vol_portal -p 3306:3306 -e MYSQL_ROOT_PASSWORD=Aa123456 --net=host --name ${DB_CONT_NAME} ${DB_IMG_NAME};
+echo "Running docker image ${DB_IMG_NAME} as name ${DB_CONT_NAME} with volume ${DB_VOL_NAME}"
+docker run -d --volumes-from ${DB_VOL_NAME} -p 3306:3306 -e MYSQL_ROOT_PASSWORD=Aa123456 --net=host --name ${DB_CONT_NAME} ${DB_IMG_NAME};
diff --git a/deliveries/os_docker_push.sh b/deliveries/os_docker_push.sh
index 2c41151d..2ec6de42 100755
--- a/deliveries/os_docker_push.sh
+++ b/deliveries/os_docker_push.sh
@@ -11,13 +11,13 @@ TIMESTAMP=$(date +%C%y%m%dT%H%M%S)
 VERSION="1.1.0-SNAPSHOT-${TIMESTAMP}"
 LATEST="latest"
 
-APPS_VERSION="${REPO}/openecomp/portalapps:${VERSION}"
-DB_VERSION="${REPO}/openecomp/portaldb:${VERSION}"
-WMS_VERSION="${REPO}/openecomp/portalwms:${VERSION}"
+APPS_VERSION="${REPO}/openecomp/${EP_TAG_NAME}:${VERSION}"
+DB_VERSION="${REPO}/openecomp/${DB_TAG_NAME}:${VERSION}"
+WMS_VERSION="${REPO}/openecomp/${WMS_TAG_NAME}:${VERSION}"
 
-APPS_LATEST="${REPO}/openecomp/portalapps:${LATEST}"
-DB_LATEST="${REPO}/openecomp/portaldb:${LATEST}"
-WMS_LATEST="${REPO}/openecomp/portalwms:${LATEST}"
+APPS_LATEST="${REPO}/openecomp/${EP_TAG_NAME}:${LATEST}"
+DB_LATEST="${REPO}/openecomp/${DB_TAG_NAME}:${LATEST}"
+WMS_LATEST="${REPO}/openecomp/${WMS_TAG_NAME}:${LATEST}"
 
 # tag versions
 docker tag ${EP_IMG_NAME} ${APPS_VERSION}
diff --git a/deliveries/os_docker_release.sh b/deliveries/os_docker_release.sh
index 91b5e187..2bd2e20d 100755
--- a/deliveries/os_docker_release.sh
+++ b/deliveries/os_docker_release.sh
@@ -11,13 +11,13 @@ TIMESTAMP=$(date +%C%y%m%dT%H%M%S)
 VERSION="1.1.0-STAGING-${TIMESTAMP}"
 LATEST="1.1-STAGING-latest"
 
-APPS_VERSION="${REPO}/openecomp/portalapps:${VERSION}"
-DB_VERSION="${REPO}/openecomp/portaldb:${VERSION}"
-WMS_VERSION="${REPO}/openecomp/portalwms:${VERSION}"
+APPS_VERSION="${REPO}/openecomp/${EP_TAG_NAME}:${VERSION}"
+DB_VERSION="${REPO}/openecomp/${DB_TAG_NAME}:${VERSION}"
+WMS_VERSION="${REPO}/openecomp/${WMS_TAG_NAME}:${VERSION}"
 
-APPS_LATEST="${REPO}/openecomp/portalapps:${LATEST}"
-DB_LATEST="${REPO}/openecomp/portaldb:${LATEST}"
-WMS_LATEST="${REPO}/openecomp/portalwms:${LATEST}"
+APPS_LATEST="${REPO}/openecomp/${EP_TAG_NAME}:${LATEST}"
+DB_LATEST="${REPO}/openecomp/${DB_TAG_NAME}:${LATEST}"
+WMS_LATEST="${REPO}/openecomp/${WMS_TAG_NAME}:${LATEST}"
 
 # tag version
 docker tag ${EP_IMG_NAME} ${APPS_VERSION}
diff --git a/deliveries/os_settings.sh b/deliveries/os_settings.sh
index c4b7a95d..beb43d3e 100755
--- a/deliveries/os_settings.sh
+++ b/deliveries/os_settings.sh
@@ -1,13 +1,20 @@
 #!/bin/bash
+# Establish constants for the management shell scripts.
+# These variables are ALSO used in demo/boot/portal_vm_init.sh
 
-# This docker image name is hardcoded at the ONAP demo repository,
-# so changing it is nontrivial.
+EP_TAG_NAME=portalapps
 EP_IMG_NAME=ep:1610-1
 EP_CONT_NAME=onap_portal
+
+DB_TAG_NAME=portaldb
 DB_IMG_NAME=ecompdb:portal
 DB_CONT_NAME=ecompdb_portal
+DB_VOL_NAME=data_vol_portal
+
+WMS_TAG_NAME=portalwms
 WMS_IMG_NAME=widget-ms
 WMS_CONT_NAME=ecomp-portal-widget-ms
+
 VERSION=1.1.0
 ETCDIR=etc
 WORKINGDIR=PROJECT
-- 
cgit 1.2.3-korg