diff options
author | 2017-04-27 07:01:24 +0000 | |
---|---|---|
committer | 2017-05-02 06:14:44 +0000 | |
commit | 4d86cd2a8934a247319ea13d1be19bb4e631afd5 (patch) | |
tree | 1daacbdfdfc52093ba536f542b8e8f264b513ffe /functest/ci/check_os.sh | |
parent | 90238c6c2c6b8c63062f3fe1c1611d594d72604b (diff) |
Add the choice of interface for keystoneclient
1. When functest is running on external host not jumpserver,
keystoneclient is used to retrieve or create projects/tenants
and users, which would fail to establish connection to the admin
endpoint.
2. Keystoneclient will connect to the public endpoint by setting the
env OS_INTERFACE to be public.
3. Remove the admin endpoint check in check_os.sh.
JIRA: FUNCTEST-801
Change-Id: I324f5c8fdf61447319070a23f6b6bc6b1bbc1d48
Signed-off-by: Linda Wang <wangwulin@huawei.com>
Diffstat (limited to 'functest/ci/check_os.sh')
-rwxr-xr-x | functest/ci/check_os.sh | 24 |
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 |