From: Casey Bodley <cbodley@redhat.com>
Date: Mon, 6 May 2019 20:32:40 +0000 (-0400)
Subject: test/rgw: add bash variable for url
X-Git-Tag: v15.1.0~2686^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3cb21a4d00efed616e62edb3786ff6b81f072921;p=ceph.git

test/rgw: add bash variable for url

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/test/rgw/test-rgw-common.sh b/src/test/rgw/test-rgw-common.sh
index 0f8918f213f..86bb62fd9c2 100644
--- a/src/test/rgw/test-rgw-common.sh
+++ b/src/test/rgw/test-rgw-common.sh
@@ -61,6 +61,8 @@ mstop=$root_path/mstop.sh
 mrun=$root_path/mrun
 mrgw=$root_path/mrgw.sh
 
+url=http://localhost
+
 function start_ceph_cluster {
   [ $# -ne 1 ] && echo "start_ceph_cluster() needs 1 param" && exit 1
 
@@ -115,10 +117,10 @@ function init_zone_in_existing_zg {
   access_key=$7
   secret=$8
 
-  x $(rgw_admin $cid) realm pull --url=http://localhost:$master_zg_zone1_port --access-key=${access_key} --secret=${secret} --default
+  x $(rgw_admin $cid) realm pull --url=$url:$master_zg_zone1_port --access-key=${access_key} --secret=${secret} --default
   x $(rgw_admin $cid) zonegroup default --rgw-zonegroup=$zg
   x $(rgw_admin $cid) zone create --rgw-zonegroup=$zg --rgw-zone=$zone --access-key=${access_key} --secret=${secret} --endpoints=$endpoints
-  x $(rgw_admin $cid) period update --commit --url=http://localhost:$master_zg_zone1_port --access-key=${access_key} --secret=${secret}
+  x $(rgw_admin $cid) period update --commit --url=$url:$master_zg_zone1_port --access-key=${access_key} --secret=${secret}
 }
 
 function init_first_zone_in_slave_zg {
@@ -135,7 +137,7 @@ function init_first_zone_in_slave_zg {
   secret=$8
 
 # create zonegroup, zone
-  x $(rgw_admin $cid) realm pull --url=http://localhost:$master_zg_zone1_port --access-key=${access_key} --secret=${secret}
+  x $(rgw_admin $cid) realm pull --url=$url:$master_zg_zone1_port --access-key=${access_key} --secret=${secret}
   x $(rgw_admin $cid) realm default --rgw-realm=$realm
   x $(rgw_admin $cid) zonegroup create --rgw-realm=$realm --rgw-zonegroup=$zg --endpoints=$endpoints --default
   x $(rgw_admin $cid) zonegroup default --rgw-zonegroup=$zg