From: Sage Weil <sage@redhat.com>
Date: Mon, 17 Jul 2017 01:28:03 +0000 (-0400)
Subject: qa/suites/rados/rest/mgr-restful: simplify
X-Git-Tag: v12.1.1~9^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F16349%2Fhead;p=ceph.git

qa/suites/rados/rest/mgr-restful: simplify

Use default port; don't bother setting bind addr.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/suites/rados/rest/mgr-restful.yaml b/qa/suites/rados/rest/mgr-restful.yaml
index 5dd16fda288..f202976e8cf 100644
--- a/qa/suites/rados/rest/mgr-restful.yaml
+++ b/qa/suites/rados/rest/mgr-restful.yaml
@@ -8,8 +8,6 @@ tasks:
       - (MGR_DOWN)
 - exec:
     mon.a:
-      - ceph config-key put mgr/restful/x/server_addr 127.0.0.1
-      - ceph config-key put mgr/restful/x/server_port 9999
       - ceph tell mgr.x restful create-key admin
       - ceph tell mgr.x restful create-self-signed-cert
 - ceph.restart: [mgr.x]
diff --git a/qa/workunits/rest/test-restful.sh b/qa/workunits/rest/test-restful.sh
index 7beec9fc6b9..34fb1890537 100755
--- a/qa/workunits/rest/test-restful.sh
+++ b/qa/workunits/rest/test-restful.sh
@@ -7,8 +7,8 @@ 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`
-port=`ceph config-key get $prefix/server_port`
+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"
 $mydir/test_mgr_rest_api.py $url $secret