RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-28 22:43:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Casey Bodley 2019-03-05 10:50:23 -05:00
parent 921faebb72
commit 3ff5f0c240
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qa/suites/rgw/multisite/tasks/test_multi.yaml
View File

@ -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:

9
qa/tasks/rgw.py
View File

@ -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)