From: Charlie Kang <charlie.kang@intel.com>
Date: Tue, 17 Oct 2017 22:42:52 +0000 (-0700)
Subject: Resolve full path to adminrc file if full path is not provided
X-Git-Tag: opnfv-6.0.0~316^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F11%2F45411%2F2;p=yardstick.git

Resolve full path to adminrc file if full path is not provided

Change-Id: I7e9d8074b5d956c864a0b3264926eee89e66dc35
Signed-off-by: Charlie Kang <charlie.kang@intel.com>
---

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"