summaryrefslogtreecommitdiffstats
path: root/functest/ci
diff options
context:
space:
mode:
authorJose Lausuch <jose.lausuch@ericsson.com>2017-05-04 12:11:59 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-05-04 12:11:59 +0000
commit55d0b662f08ef3c648acfb8d3f1c6f6c71992187 (patch)
tree6af1ad3fd93e12ed18472b345fa1f536e8f7aefe /functest/ci
parent392cae434cce5dcf5a5e8dedc18b2791e3dd8e94 (diff)
parent4d86cd2a8934a247319ea13d1be19bb4e631afd5 (diff)
Merge "Add the choice of interface for keystoneclient"
Diffstat (limited to 'functest/ci')
-rwxr-xr-xfunctest/ci/check_os.sh24
1 files changed, 0 insertions, 24 deletions
diff --git a/functest/ci/check_os.sh b/functest/ci/check_os.sh
index 83f9f476..ce0bc20c 100755
--- a/functest/ci/check_os.sh
+++ b/functest/ci/check_os.sh
@@ -86,30 +86,6 @@ if [ $RETVAL -ne 0 ]; then
fi
echo " ...OK"
-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|grep -Po '(?<=:)\d+')
-https_enabled=$(echo $adminURL | grep 'https')
-if [[ -n $https_enabled ]]; then
- echo ">>Verifying SSL connectivity to the admin endpoint $adminIP:$adminPort..."
- verify_SSL_connectivity $adminIP $adminPort
-else
- echo ">>Verifying connectivity to the admin endpoint $adminIP:$adminPort..."
- verify_connectivity $adminIP $adminPort
-fi
-RETVAL=$?
-if [ $RETVAL -ne 0 ]; then
- echo "ERROR: Cannot talk to the admin endpoint $adminIP:$adminPort ."
- echo "$adminURL"
- exit 1
-fi
-echo " ...OK"
-
echo "Checking Required OpenStack services:"
for service in $MANDATORY_SERVICES; do