qa/rgw: use default ports (80 or 443) unless overridden

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

diff --git a/qa/suites/rgw/multisite/tasks/test_multi.yaml b/qa/suites/rgw/multisite/tasks/test_multi.yaml
index 6c7ba3d10bb99b898001911e4f2eb3d705674862..22b292f8d774f6bea5760177e7726f094137b253 100644 (file)
--- a/qa/suites/rgw/multisite/tasks/test_multi.yaml
+++ b/qa/suites/rgw/multisite/tasks/test_multi.yaml
@@ -7,12 +7,16 @@ tasks:
 - ceph: {cluster: c2}
 - rgw:
     c1.client.0:
+      port: 8000
       valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214
     c1.client.1:
+      port: 8001
       valgrind: [--tool=memcheck, --max-threads=1024]
     c2.client.0:
+      port: 8000
       valgrind: [--tool=memcheck, --max-threads=1024]
     c2.client.1:
+      port: 8001
       valgrind: [--tool=memcheck, --max-threads=1024]
 - rgw-multisite:
 - rgw-multisite-tests:

diff --git a/qa/tasks/rgw.py b/qa/tasks/rgw.py
index 16e97a0d339c7dafef95d1d99ab8f345da9c0306..9e8c85740d7aa7c4abbf70f64ac8dec44e817867 100644 (file)
--- a/qa/tasks/rgw.py
+++ b/qa/tasks/rgw.py
@@ -160,10 +160,6 @@ def start_rgw(ctx, config, clients):
                 )
 
 def assign_endpoints(ctx, config, default_cert):
-    """
-    Assign port numbers starting with port 7280.
-    """
-    next_port = 7280
     role_endpoints = {}
     for role, client_config in config.iteritems():
         client_config = client_config or {}
@@ -180,10 +176,7 @@ def assign_endpoints(ctx, config, default_cert):
         else:
             ssl_certificate = None
 
-        port = client_config.get('port')
-        if not port:
-            port = next_port
-            next_port += 1
+        port = client_config.get('port', 443 if ssl_certificate else 80)
 
         role_endpoints[role] = RGWEndpoint(remote.hostname, port, ssl_certificate)