summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharlie Kang <charlie.kang@intel.com>2017-10-17 15:42:52 -0700
committerCharlie Kang <charlie.kang@intel.com>2017-10-17 23:44:20 +0000
commitbaa6c60b3216a41978a136b9d32e054c52153935 (patch)
treea4c303e75151070ee28f6207dd5e0c002d4ae242
parentf6bc49db9b164b8e8c9bba99b1d513edc2cc610f (diff)
Resolve full path to adminrc file if full path is not provided
Change-Id: I7e9d8074b5d956c864a0b3264926eee89e66dc35 Signed-off-by: Charlie Kang <charlie.kang@intel.com>
-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"