From: Casey Bodley Date: Thu, 5 Sep 2019 19:52:15 +0000 (-0400) Subject: qa/rgw: s3test tasks sets s3website_domain to match dns-s3website-name X-Git-Tag: v15.1.0~1523^2~2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=71312246addfe78e56467b8daec39236655fafcc;p=ceph-ci.git qa/rgw: s3test tasks sets s3website_domain to match dns-s3website-name Signed-off-by: Casey Bodley --- diff --git a/qa/tasks/s3tests.py b/qa/tasks/s3tests.py index 8e36e57ceec..f3201cbfa7a 100644 --- a/qa/tasks/s3tests.py +++ b/qa/tasks/s3tests.py @@ -188,6 +188,15 @@ def configure(ctx, config): s3tests_conf['DEFAULT']['host'] = endpoint.dns_name + website_role = properties.get('rgw_website_server') + if website_role: + website_endpoint = ctx.rgw.role_endpoints.get(website_role) + assert website_endpoint, \ + 's3tests: no rgw endpoint for rgw_website_server {}'.format(website_role) + assert website_endpoint.website_dns_name, \ + 's3tests: no dns-s3website-name for rgw_website_server {}'.format(website_role) + s3tests_conf['DEFAULT']['s3website_domain'] = website_endpoint.website_dns_name + kms_key = properties.get('kms_key') if kms_key: host = None