qa/rgw: s3test tasks sets s3website_domain to match dns-s3website-name

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

diff --git a/qa/tasks/s3tests.py b/qa/tasks/s3tests.py
index 8e36e57ceecdc06d1c6d551621110d0422c8c546..f3201cbfa7a0bd3bdbb284803a6b0c61c1e1d1ce 100644 (file)
--- 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