summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2017-10-19 02:58:50 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-10-19 02:58:50 +0000
commitb581997d49708b32096d62f863676fa9bfc2c834 (patch)
tree649e65a50e62719dd4714062bc6b11c0872892e5
parent63679e6c68f6d3d881e222351785660dcac93f73 (diff)
parent2ccb732229ffd0f6ec57bac29ef2a4c20029390c (diff)
Merge "Resolve full path to adminrc file if full path is not provided" into stable/euphrates
-rwxr-xr-xnsb_setup.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/nsb_setup.sh b/nsb_setup.sh
index 1c27af7db..28d31967f 100755
--- a/nsb_setup.sh
+++ b/nsb_setup.sh
@@ -25,8 +25,8 @@ done
pip install ansible==2.3.2 shade==1.17.0 docker-py==1.10.6
if [ $# -eq 1 ]; then
- extra_args="-e openrc_file=$1"
- OPENRC=$1
+ OPENRC=$(readlink -f -- "$1")
+ extra_args="-e openrc_file=${OPENRC}"
source "${OPENRC}"
CONTROLLER_IP=$(echo ${OS_AUTH_URL} | sed -ne "s/http:\/\/\(.*\):.*/\1/p")
export no_proxy="localhost,127.0.0.1,${CONTROLLER_IP},$no_proxy"