From 0411fecdb42f876047ea35baac71b3422c855706 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Tue, 9 Oct 2018 19:14:46 -0500
Subject: [PATCH] Remove working dir issues from deploy scripts

This lets the deployment scripts not care about the current working
dir.  It also puts the vms directory in wherever the current working
directory actually is, allowing more than one set of stx VMs to be
controlled at a time.

Change-Id: I21ae6f4e7ea327c62cf04fc877161032daf1223e
Signed-off-by: Dean Troyer <dtroyer@gmail.com>
---
 deployment/libvirt/cleanup_network.sh             | 4 ++--
 deployment/libvirt/destroy_allinone.sh            | 4 ++--
 deployment/libvirt/destroy_standard_controller.sh | 4 ++--
 deployment/libvirt/setup_allinone.sh              | 6 ++++--
 deployment/libvirt/setup_standard_controller.sh   | 8 +++++---
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/deployment/libvirt/cleanup_network.sh b/deployment/libvirt/cleanup_network.sh
index a783a8c0a..c6f0fac3d 100755
--- a/deployment/libvirt/cleanup_network.sh
+++ b/deployment/libvirt/cleanup_network.sh
@@ -2,9 +2,9 @@
 #
 # cleanup_network.sh - Cleans up network interfaces - not safe to run blindly!
 
-MY_WORKING_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}" )" )"
+SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}" )" )"
 
-source ${MY_WORKING_DIR}/functions.sh
+source ${SCRIPT_DIR}/functions.sh
 
 NETWORK_DEFAULT=${NETWORK_DEFAULT:-default}
 BRIDGE_INTERFACE=${BRIDGE_INTERFACE=stxbr0}
diff --git a/deployment/libvirt/destroy_allinone.sh b/deployment/libvirt/destroy_allinone.sh
index 3b69e04e7..911fad2d8 100755
--- a/deployment/libvirt/destroy_allinone.sh
+++ b/deployment/libvirt/destroy_allinone.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
-MY_WORKING_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}" )" )"
+SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}" )" )"
 
-source ${MY_WORKING_DIR}/functions.sh
+source ${SCRIPT_DIR}/functions.sh
 
 BRIDGE_INTERFACE=${BRIDGE_INTERFACE:-stxbr}
 CONTROLLER=${CONTROLLER:-controller-allinone}
diff --git a/deployment/libvirt/destroy_standard_controller.sh b/deployment/libvirt/destroy_standard_controller.sh
index 0d65ce912..81ac6b54d 100755
--- a/deployment/libvirt/destroy_standard_controller.sh
+++ b/deployment/libvirt/destroy_standard_controller.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
-MY_WORKING_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}" )" )"
+SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}" )" )"
 
-source ${MY_WORKING_DIR}/functions.sh
+source ${SCRIPT_DIR}/functions.sh
 
 BRIDGE_INTERFACE=${BRIDGE_INTERFACE:-stxbr}
 CONTROLLER=${CONTROLLER:-controller}
diff --git a/deployment/libvirt/setup_allinone.sh b/deployment/libvirt/setup_allinone.sh
index 091593a52..5069db712 100755
--- a/deployment/libvirt/setup_allinone.sh
+++ b/deployment/libvirt/setup_allinone.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}" )" )"
+
 usage() {
     echo "$0 [-h] [-i <iso image>]"
     echo ""
@@ -38,7 +40,7 @@ CONTROLLER=${CONTROLLER:-controller-allinone}
 DOMAIN_DIRECTORY=vms
 DOMAIN_FILE=$DOMAIN_DIRECTORY/$CONTROLLER.xml
 
-bash destroy_allinone.sh
+bash ${SCRIPT_DIR}/destroy_allinone.sh
 
 [ ! -d ${DOMAIN_DIRECTORY} ] && mkdir ${DOMAIN_DIRECTORY}
 
@@ -49,7 +51,7 @@ for i in {0..1}; do
     sudo qemu-img create -f qcow2 /var/lib/libvirt/images/${CONTROLLER_NODE}-2.img 200G
     ISOIMAGE=${ISOIMAGE}
     DOMAIN_FILE=${DOMAIN_DIRECTORY}/${CONTROLLER_NODE}.xml
-    cp controller_allinone.xml ${DOMAIN_FILE}
+    cp ${SCRIPT_DIR}/controller_allinone.xml ${DOMAIN_FILE}
     sed -i -e "
         s,NAME,${CONTROLLER_NODE},
         s,DISK0,/var/lib/libvirt/images/${CONTROLLER_NODE}-0.img,
diff --git a/deployment/libvirt/setup_standard_controller.sh b/deployment/libvirt/setup_standard_controller.sh
index 6ed6f087f..0ce994ab2 100755
--- a/deployment/libvirt/setup_standard_controller.sh
+++ b/deployment/libvirt/setup_standard_controller.sh
@@ -2,6 +2,8 @@
 
 #set -x
 
+SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}" )" )"
+
 usage() {
     echo "$0 [-h] [-i <iso image>]"
     echo ""
@@ -40,7 +42,7 @@ CONTROLLER=${CONTROLLER:-controller}
 COMPUTE=${COMPUTE:-compute}
 DOMAIN_DIRECTORY=vms
 
-bash destroy_standard_controller.sh
+bash ${SCRIPT_DIR}/destroy_standard_controller.sh
 
 [ ! -d ${DOMAIN_DIRECTORY} ] && mkdir ${DOMAIN_DIRECTORY}
 
@@ -50,7 +52,7 @@ for i in {0..1}; do
     sudo qemu-img create -f qcow2 /var/lib/libvirt/images/${CONTROLLER_NODE}-1.img 200G
     ISOIMAGE=${ISOIMAGE}
     DOMAIN_FILE=${DOMAIN_DIRECTORY}/${CONTROLLER_NODE}.xml
-    cp controller.xml ${DOMAIN_FILE}
+    cp ${SCRIPT_DIR}/controller.xml ${DOMAIN_FILE}
     sed -i -e "
         s,NAME,${CONTROLLER_NODE},
         s,DISK0,/var/lib/libvirt/images/${CONTROLLER_NODE}-0.img,
@@ -76,7 +78,7 @@ for i in {0..1}; do
     sudo qemu-img create -f qcow2 /var/lib/libvirt/images/${COMPUTE_NODE}-0.img 200G
     sudo qemu-img create -f qcow2 /var/lib/libvirt/images/${COMPUTE_NODE}-1.img 200G
     DOMAIN_FILE=${DOMAIN_DIRECTORY}/${COMPUTE_NODE}.xml
-    cp compute.xml ${DOMAIN_FILE}
+    cp ${SCRIPT_DIR}/compute.xml ${DOMAIN_FILE}
     sed -i -e "
         s,NAME,${COMPUTE_NODE},;
         s,DISK0,/var/lib/libvirt/images/${COMPUTE_NODE}-0.img,;