openstack/openstack-ansible
Code Issues Proposed changes

Merge "Change into correct path"

Browse Source
This commit is contained in:
Zuul 2018-09-19 03:12:23 +00:00 committed by Gerrit Code Review
commit 07a6577684
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
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

2
scripts/bootstrap-ansible.sh
View File

@ -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