qa/workunits/rest: Better detection of rest url

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>

diff --git a/qa/workunits/rest/test-restful.sh b/qa/workunits/rest/test-restful.sh
index 34fb189053731bef690f0486eed2493982c68626..fde0d107a0bd23e5a94774901020b306b92c09eb 100755 (executable)
--- 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