From: Brad Hubbard Date: Fri, 22 Feb 2019 02:16:38 +0000 (+1000) Subject: qa/workunits/rest: Better detection of rest url X-Git-Tag: v15.0.0~196^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d1892aaf6b63f272f0ec4fb068d95bf45d9562f3;p=ceph.git qa/workunits/rest: Better detection of rest url Signed-off-by: Brad Hubbard --- diff --git a/qa/workunits/rest/test-restful.sh b/qa/workunits/rest/test-restful.sh index 34fb1890537..fde0d107a0b 100755 --- a/qa/workunits/rest/test-restful.sh +++ b/qa/workunits/rest/test-restful.sh @@ -3,14 +3,8 @@ mydir=`dirname $0` secret=`ceph config-key get mgr/restful/keys/admin` -active=`ceph mgr dump | jq -r .active_name` -echo "active $active admin secret $secret" - -prefix="mgr/restful/$active" -addr=`ceph config-key get $prefix/server_addr || echo 127.0.0.1` -port=`ceph config-key get $prefix/server_port || echo 8003` -url="https://$addr:$port" -echo "prefix $prefix url $url" +url=$(ceph mgr dump|jq -r .services.restful|sed -e 's/\/$//') +echo "url $url secret $secret" $mydir/test_mgr_rest_api.py $url $secret echo $0 OK