import quincy beta 17.1.0

[ceph.git] / ceph / src / test / rgw / test-rgw-common.sh

diff --git a/ceph/src/test/rgw/test-rgw-common.sh b/ceph/src/test/rgw/test-rgw-common.sh
index f65bbf20f4655eb0b003461bdc9ff92e5f3d2667..e7f5a862bdf220eff109f11d75bef9299ea2df7f 100644 (file)
--- a/ceph/src/test/rgw/test-rgw-common.sh
+++ b/ceph/src/test/rgw/test-rgw-common.sh
@@ -76,9 +76,14 @@ function rgw_admin {
 }
 
 function rgw {
-  [ $# -ne 2 ] && echo "rgw() needs 2 params" && exit 1
+  [ $# -lt 2 ] && echo "rgw() needs at least 2 params" && exit 1
 
-  echo "$mrgw $1 $2 $rgw_flags"
+  name=$1
+  port=$2
+  ssl_port=0 #ssl port not used
+  shift 2
+
+  echo "$mrgw $name $port $ssl_port $rgw_flags $@"
 }
 
 function init_first_zone {