From 13c405da7833db869de12c804dc8db2afc2c6bd3 Mon Sep 17 00:00:00 2001
From: Nicolas Bock <nicolasbock@gmail.com>
Date: Thu, 13 Sep 2018 05:55:18 -0600
Subject: [PATCH] Change into correct path

The `bootstrap-aio.sh` script needs to be executed from the root of
the repository. This change makes sure that this is the case just as
we already do in `bootstrap-ansible.sh`.

Change-Id: I975e6022e832623595f66174ebb8968bf82f5c5f
---
 scripts/bootstrap-aio.sh     | 3 +++
 scripts/bootstrap-ansible.sh | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-aio.sh b/scripts/bootstrap-aio.sh
index ab47c3f6d6..4be83f1e7d 100755
--- a/scripts/bootstrap-aio.sh
+++ b/scripts/bootstrap-aio.sh
@@ -24,6 +24,9 @@ export BOOTSTRAP_OPTS=${BOOTSTRAP_OPTS:-''}
 # Store the clone repo root location
 export OSA_CLONE_DIR="${OSA_CLONE_DIR:-$(readlink -f $(dirname $0)/..)}"
 
+# This script should be executed from the root directory of the cloned repo
+cd "$(dirname "${0}")/.."
+
 ## Main ----------------------------------------------------------------------
 
 # Ensure that some of the wrapper options are overridden
diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh
index f8e3063c66..f34f9c7c2e 100755
--- a/scripts/bootstrap-ansible.sh
+++ b/scripts/bootstrap-ansible.sh
@@ -18,7 +18,6 @@
 ## Shell Opts ----------------------------------------------------------------
 set -e -u -x
 
-
 ## Vars ----------------------------------------------------------------------
 export HTTP_PROXY=${HTTP_PROXY:-""}
 export HTTPS_PROXY=${HTTPS_PROXY:-""}
@@ -40,7 +39,6 @@ export OSA_WRAPPER_BIN="${OSA_WRAPPER_BIN:-scripts/openstack-ansible.sh}"
 # This script should be executed from the root directory of the cloned repo
 cd "$(dirname "${0}")/.."
 
-
 ## Functions -----------------------------------------------------------------
 info_block "Checking for required libraries." 2> /dev/null ||
     source scripts/scripts-library.sh