From 71312246addfe78e56467b8daec39236655fafcc Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 5 Sep 2019 15:52:15 -0400 Subject: [PATCH] qa/rgw: s3test tasks sets s3website_domain to match dns-s3website-name Signed-off-by: Casey Bodley --- qa/tasks/s3tests.py | 9 +++++++++ 1 file changed, 9 insertions(+) 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 -- 2.39.5