diff options
| author |   Dan Radez <dradez@redhat.com> | 2017-04-12 10:04:55 -0400 |
|---|---|---|
| committer | Dan Radez <dradez@redhat.com> | 2017-04-13 09:37:10 -0400 |
| commit | a53de635ee773435f8a789844b484a35441e6862 (patch) | |
| tree | 1079222af2d1c3fc1bb3bb493f117ec1ab739bcd | |
| parent | f85b54b8fc8843897f9c1a7b4711b489ab29f297 (diff) | |
update check_os.sh admin port seds to match public
If there's not a / on the end of the admin url then port is not found
public already handled this correctly. updating admin to match public
JIRA: FUNCTEST-793
Change-Id: I01d654dfe247c6102a90ba7ea3921a9f15991789
Signed-off-by: Dan Radez <dradez@redhat.com>
| -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 3920b7ac..83f9f476 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..." |