diff options
| author |   Cedric Ollivier <ollivier.cedric@gmail.com> | 2017-04-13 15:28:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-04-13 15:28:43 +0000 |
| commit | 32ccb8926fd7057fed83f68e9035bd13577bf58a (patch) | |
| tree | 1dcefef5c00e21a23b8ea06b432819d207ef1716 | |
| parent | 888271575907898d80081e69b37f879091a636fc (diff) | |
| parent | a53de635ee773435f8a789844b484a35441e6862 (diff) | |
Merge "update check_os.sh admin port seds to match public"
| -rwxr-xr-x | functest/ci/check_os.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/functest/ci/check_os.sh b/functest/ci/check_os.sh index 3920b7ac6..83f9f476d 100755 --- a/functest/ci/check_os.sh +++ b/functest/ci/check_os.sh @@ -69,7 +69,7 @@ fi echo "Checking OpenStack endpoints:" publicURL=$(openstack catalog show identity |awk '/public/ {print $4}') publicIP=$(echo $publicURL|sed 's/^.*http.*\:\/\///'|sed 's/.[^:]*$//') -publicPort=$(echo $publicURL|sed 's/^.*://'|sed 's/\/.*$//') +publicPort=$(echo $publicURL|grep -Po '(?<=:)\d+') https_enabled=$(echo $publicURL | grep 'https') if [[ -n $https_enabled ]]; then echo ">>Verifying SSL connectivity to the public endpoint $publicIP:$publicPort..." @@ -93,7 +93,7 @@ if [ -z ${adminURL} ]; then exit 1 fi adminIP=$(echo $adminURL|sed 's/^.*http.*\:\/\///'|sed 's/.[^:]*$//') -adminPort=$(echo $adminURL|sed 's/^.*://'|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..." |