diff options
| author |   Charlie Kang <charlie.kang@intel.com> | 2017-10-17 15:42:52 -0700 |
|---|---|---|
| committer |   Ross Brattain <ross.b.brattain@intel.com> | 2017-10-19 00:11:45 +0000 |
| commit | 2ccb732229ffd0f6ec57bac29ef2a4c20029390c (patch) | |
| tree | 37014a94ce1bbc6c651e5c9831ef6c506ecf41a5 | |
| parent | fc9af8a1fb0a562f810549605f23f46fea3d2b3f (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>
(cherry picked from commit baa6c60b3216a41978a136b9d32e054c52153935)
| -rwxr-xr-x | nsb_setup.sh | 4 |
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" |