Fix controller IP parsing in "nsb_setup.sh" script 11/48911/1
authorRodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
Fri, 27 Oct 2017 10:43:29 +0000 (11:43 +0100)
committerRoss Brattain <ross.b.brattain@intel.com>
Thu, 14 Dec 2017 04:26:32 +0000 (04:26 +0000)
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)

nsb_setup.sh

index 28d3196..40293fe 100755 (executable)
@@ -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