summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>2017-10-27 11:43:29 +0100
committerRoss Brattain <ross.b.brattain@intel.com>2017-12-14 04:26:32 +0000
commitb2221a6d2241ff536bee7eff6f22d41161d4e3c3 (patch)
treee361bb8964d94effd23bd32933e49f5bc42a7161
parent71f18a582481c3d51c8e2a1450f4ca71bd2a20d7 (diff)
Fix controller IP parsing in "nsb_setup.sh" script
Fixed the controller IP parsing in "nsb_setup.sh" script. The new regex expression now accepts "OS_AUTH_URL" as: * http://10.237.223.168/identity * http://10.237.223.168:5000/identity * http://hostname/identity * http://hostname:5000/identity JIRA: YARDSTICK-829 Change-Id: Ifaeab991bcbb6aa7b22c3533ab7554527184878b Signed-off-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com> (cherry picked from commit b5e35986a77831841b064e435a6041a121634bec)
-rwxr-xr-xnsb_setup.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/nsb_setup.sh b/nsb_setup.sh
index 28d31967f..40293fef9 100755
--- a/nsb_setup.sh
+++ b/nsb_setup.sh
@@ -28,7 +28,7 @@ if [ $# -eq 1 ]; then
OPENRC=$(readlink -f -- "$1")
extra_args="-e openrc_file=${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