Code Review
/
yardstick.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
| inline |
side by side
(parent:
fc9af8a
)
Resolve full path to adminrc file if full path is not provided
89/45689/1
author
Charlie Kang
<charlie.kang@intel.com>
Tue, 17 Oct 2017 22:42:52 +0000
(15:42 -0700)
committer
Ross Brattain
<ross.b.brattain@intel.com>
Thu, 19 Oct 2017 00:11:45 +0000
(
00:11
+0000)
Change-Id: I7e9d8074b5d956c864a0b3264926eee89e66dc35
Signed-off-by: Charlie Kang <charlie.kang@intel.com>
(cherry picked from commit
baa6c60b3216a41978a136b9d32e054c52153935
)
nsb_setup.sh
patch
|
blob
|
history
diff --git
a/nsb_setup.sh
b/nsb_setup.sh
index
1c27af7
..
28d3196
100755
(executable)
--- 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"