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

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 3ff5f0c2406e40d1024d8152e0ac9400302a757a)

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 c48a4677ca7cedd9893049492bd9fa695a0371b5..42de0efe66358cd0430b54930c3b16044ba9def9 100644 (file)
--- a/qa/tasks/rgw.py
+++ b/qa/tasks/rgw.py
@@ -168,10 +168,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 {}
@@ -188,10 +184,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)
 
         # if dns-name is given, use it as the hostname (or as a prefix)
         dns_name = client_config.get('dns-name', '')