From: Marc Alexandre Choquette <m.a.choquette@bell.ca>
Date: Fri, 23 Mar 2018 19:17:32 +0000 (-0400)
Subject: Replaced 'dcae' by $STACK_NAME
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F87%2F38187%2F1;p=oom.git

Replaced 'dcae' by $STACK_NAME

Script used static 'dcae' stack name, so when
changing it in the $STACK_NAME variable it was ignored in the
'stack output show' commands

Change-Id: I2c8bbda651dffd7ef4ed6041864af02ef21353eb
Issue-ID: OOM-673
Signed-off-by: Marc Alexandre Choquette <m.a.choquette@bell.ca>
---

diff --git a/kubernetes/config/docker/init/src/config/dcaegen2/heat/entrypoint.sh b/kubernetes/config/docker/init/src/config/dcaegen2/heat/entrypoint.sh
index a4ab371cf1..c9ba83cc4c 100755
--- a/kubernetes/config/docker/init/src/config/dcaegen2/heat/entrypoint.sh
+++ b/kubernetes/config/docker/init/src/config/dcaegen2/heat/entrypoint.sh
@@ -150,11 +150,11 @@ then
     sleep 10
 
     # get the DCAE Boostrap VM ip, to configure Robot with it, for Healthcheck
-    DCAE_CONTROLLER_IP=`openstack stack output show dcae dcae_floating_ip -c output_value -f yaml | awk '{ print $2}'`
+    DCAE_CONTROLLER_IP=`openstack stack output show $STACK_NAME dcae_floating_ip -c output_value -f yaml | awk '{ print $2}'`
     sed -i -e "s/DCAE_CONTROLLER_IP_HERE/$DCAE_CONTROLLER_IP/g" /opt/robot/vm_properties.py;
 
     # Retrieve current deployment random string
-    RANDOM_STRING=`openstack stack output show dcae random_string -c output_value -f yaml | awk '{ print $2}'`
+    RANDOM_STRING=`openstack stack output show $STACK_NAME random_string -c output_value -f yaml | awk '{ print $2}'`
     SIMPLEDEMO_ONAP_ORG_ZONE_NAME="$RANDOM_STRING.$SIMPLEDEMO_ONAP_ORG_ZONE_NAME"
 fi