From 30b9540a6c4eb8aa94c0cd203423fa4913d00238 Mon Sep 17 00:00:00 2001 From: David C Kennedy Date: Tue, 8 Nov 2016 15:47:23 +0000 Subject: [PATCH] Fixed the refresh script The refresh script, usable in development to update the code executed in monasca-transform from the developers local copy was broken. When the refresh was carried out the script copied a fresh configuration file into place, wiping the changes made by the devstack plugin during deployment. This resulted in an incorrect ip address being used for the kafka broker. Change-Id: I606dad9f6c8a59006e37560f5bb5fdceb51266d4 --- tools/vagrant/refresh_monasca_transform.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/vagrant/refresh_monasca_transform.sh b/tools/vagrant/refresh_monasca_transform.sh index e5ede2a..1f080b2 100755 --- a/tools/vagrant/refresh_monasca_transform.sh +++ b/tools/vagrant/refresh_monasca_transform.sh @@ -6,6 +6,11 @@ else echo Yikes, no - this is not pg-tips! exit 1 fi +if [ -d "/home/vagrant/devstack" ] ; then + +. /home/vagrant/devstack/.stackenv + +fi SCRIPT_HOME=$(dirname $(readlink -f $BASH_SOURCE)) pushd $SCRIPT_HOME @@ -32,6 +37,9 @@ sudo cp /home/vagrant/monasca-transform/scripts/monasca-transform.zip /opt/monas # update the configuration file sudo cp /home/vagrant/monasca-transform/devstack/files/monasca-transform/monasca-transform.conf /etc/. +if [ -n "$SERVICE_HOST" ]; then + sudo sudo sed -i "s/brokers=192\.168\.15\.6:9092/brokers=${SERVICE_HOST}:9092/g" /etc/monasca-transform.conf +fi # delete the venv sudo rm -rf /opt/monasca/transform/venv