From: Christopher Lott (cl778h) <clott@research.att.com>
Date: Mon, 7 Aug 2017 14:16:50 +0000 (-0400)
Subject: Drop variables now published elsewhere
X-Git-Tag: 1.0.0-Amsterdam~231
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=49e21f89f6438a9e6dbf25d4074314d529b347de;p=demo.git

Drop variables now published elsewhere

Changes were merged to the os_settings.sh script within portal/deliveries
so drop the redundant assignments in the portal_vm_init.sh script.

Change-Id: If0c61dac343aebf4488525184597807095649307
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
---

diff --git a/boot/portal_vm_init.sh b/boot/portal_vm_init.sh
index 942fc52d..5f34aae8 100755
--- a/boot/portal_vm_init.sh
+++ b/boot/portal_vm_init.sh
@@ -14,14 +14,9 @@ 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)
-source portal/deliveries/os_settings.sh
 
-# Remove the following lines after merging change to os_settings.sh:
-DB_VOL_NAME=data_vol_portal
-EP_TAG_NAME=portalapps
-DB_TAG_NAME=portaldb
-WMS_TAG_NAME=portalwms
-# End os_settings.sh dupe lines
+# Get container, image and tag names used below
+source portal/deliveries/os_settings.sh
 
 # Unpack property files
 unzip -o portal/deliveries/etc.zip -d /PROJECT/OpenSource/UbuntuEP/