Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Refactor userguide "Yardstick Installation"
[yardstick.git]
/
nsb_setup.sh
diff --git
a/nsb_setup.sh
b/nsb_setup.sh
index
85bd7b2
..
40293fe
100755
(executable)
--- a/
nsb_setup.sh
+++ b/
nsb_setup.sh
@@
-22,13
+22,13
@@
for i in "${pkg[@]}"; do
fi
done
fi
done
-pip install ansible==2.
2.2.0
shade==1.17.0 docker-py==1.10.6
+pip install ansible==2.
3.2
shade==1.17.0 docker-py==1.10.6
if [ $# -eq 1 ]; then
if [ $# -eq 1 ]; then
- extra_args="-e openrc_file=$1"
- OPENRC=$1
+ OPENRC=$(readlink -f -- "$1")
+ extra_args="-e openrc_file=${OPENRC}"
source "${OPENRC}"
source "${OPENRC}"
- CONTROLLER_IP=$(echo ${OS_AUTH_URL} | sed -ne "s
/http:\/\/\(.*\):.*/\1/
p")
+ CONTROLLER_IP=$(echo ${OS_AUTH_URL} | sed -ne "s
#http://\([0-9a-zA-Z.\-]*\):*[0-9]*/.*#\1#
p")
export no_proxy="localhost,127.0.0.1,${CONTROLLER_IP},$no_proxy"
fi
export no_proxy="localhost,127.0.0.1,${CONTROLLER_IP},$no_proxy"
fi