openstack/openstack-ansible
Code Issues Proposed changes

Change into correct path

Browse Source 
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
This commit is contained in:
Nicolas Bock 2018-09-13 05:55:18 -06:00 committed by Nicolas Bock
parent 9553e89e62
commit 13c405da78
No known key found for this signature in database
GPG Key ID: 9E90013DEF7F5B7B
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/bootstrap-aio.sh
View File

@ -24,6 +24,9 @@ export BOOTSTRAP_OPTS=${BOOTSTRAP_OPTS:-''}
# Store the clone repo root location # Store the clone repo root location
export OSA_CLONE_DIR="${OSA_CLONE_DIR:-$(readlink -f $(dirname $0)/..)}" 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 ---------------------------------------------------------------------- ## Main ----------------------------------------------------------------------
# Ensure that some of the wrapper options are overridden # Ensure that some of the wrapper options are overridden

2
scripts/bootstrap-ansible.sh
View File

@ -18,7 +18,6 @@
## Shell Opts ---------------------------------------------------------------- ## Shell Opts ----------------------------------------------------------------
set -e -u -x set -e -u -x
## Vars ---------------------------------------------------------------------- ## Vars ----------------------------------------------------------------------
export HTTP_PROXY=${HTTP_PROXY:-""} export HTTP_PROXY=${HTTP_PROXY:-""}
export HTTPS_PROXY=${HTTPS_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 # This script should be executed from the root directory of the cloned repo
cd "$(dirname "${0}")/.." cd "$(dirname "${0}")/.."
## Functions ----------------------------------------------------------------- ## Functions -----------------------------------------------------------------
info_block "Checking for required libraries." 2> /dev/null || info_block "Checking for required libraries." 2> /dev/null ||
source scripts/scripts-library.sh source scripts/scripts-library.sh