Adapt check_os to OpenStack Newton

When printing the identity catalog using
openstack catalog show identity, after the
Fuel uplift, we noticed that it prints the line

  admin: http://192.168.0.2:35357/v2.0

Before it was
  adminURL: http://192.168.0.2:35357/v2.0

Change-Id: I6efc996040c6ff945c67b0f346bbad7f0a723428
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>

diff --git a/functest/ci/check_os.sh b/functest/ci/check_os.sh
index 38fe32f..053796d 100644 (file)
--- a/functest/ci/check_os.sh
+++ b/functest/ci/check_os.sh
@@ -37,7 +37,12 @@ if [ $RETVAL -ne 0 ]; then
 fi
 echo "  ...OK"
 
-adminURL=$(openstack catalog show  identity |grep adminURL|awk '{print $4}')
+adminURL=$(openstack catalog show  identity |awk '/admin/ {print $4}')
+if [ -z ${adminURL} ]; then
+    echo "ERROR: Cannot determine the admin URL."
+    openstack catalog show identity
+    exit 1
+fi
 adminIP=$(echo $adminURL|sed 's/^.*http\:\/\///'|sed 's/.[^:]*$//')
 adminPort=$(echo $adminURL|sed 's/^.*://'|sed 's/.[^\/]*$//')
 echo ">>Verifying connectivity to the admin endpoint $adminIP:$adminPort..."