Merge PR #26604 into master

* refs/pull/26604/head:
	qa/workunits/rest: Better detection of rest url

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2019-03-19 22:45:43 -05:00
commit 1245809516

View File

@ -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