diff options
author | Ross Brattain <ross.b.brattain@intel.com> | 2017-10-19 00:11:17 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-10-19 00:11:17 +0000 |
commit | c9db70332cd63fce03813c66e3c91e81112a9982 (patch) | |
tree | 3e172655dcd166d669b7722fb55eb671b64ae4ae | |
parent | f9d4d0eda531fffe679904f373140943818358c8 (diff) | |
parent | baa6c60b3216a41978a136b9d32e054c52153935 (diff) |
Merge "Resolve full path to adminrc file if full path is not provided"
-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" |