From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 14 May 2019 12:30:59 +0000 (-0400)
Subject: qa/rgw: add dnsmasq back to s3a-hadoop
X-Git-Tag: v14.2.3~137^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5803f1c45b94e8dbaefa01c4645485699149bd23;p=ceph.git

qa/rgw: add dnsmasq back to s3a-hadoop

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

diff --git a/qa/suites/rgw/hadoop-s3a/s3a-hadoop.yaml b/qa/suites/rgw/hadoop-s3a/s3a-hadoop.yaml
index d9bf9f28e2a6..ed077a89f196 100644
--- a/qa/suites/rgw/hadoop-s3a/s3a-hadoop.yaml
+++ b/qa/suites/rgw/hadoop-s3a/s3a-hadoop.yaml
@@ -2,7 +2,10 @@ tasks:
 - install:
 - ceph:
 - ssh-keys:
+- dnsmasq:
+    client.0: [s3.]
 - rgw:
     client.0:
+      dns-name: s3.
 - s3a-hadoop:
     role: client.0
diff --git a/qa/tasks/s3a_hadoop.py b/qa/tasks/s3a_hadoop.py
index d4c61a2b6b33..123e739537bf 100644
--- a/qa/tasks/s3a_hadoop.py
+++ b/qa/tasks/s3a_hadoop.py
@@ -82,8 +82,8 @@ def task(ctx, config):
             run.Raw(hadoop_rel)
         ]
     )
-    configure_s3a(remote, endpoint.hostname, access_key, secret_key, bucket_name, testdir)
-    setup_user_bucket(remote, endpoint.hostname, access_key, secret_key, bucket_name, testdir)
+    configure_s3a(remote, endpoint.dns_name, access_key, secret_key, bucket_name, testdir)
+    setup_user_bucket(remote, endpoint.dns_name, access_key, secret_key, bucket_name, testdir)
     if hadoop_ver.startswith('2.8'):
         # test all ITtests but skip AWS test using public bucket landsat-pds
         # which is not available from within this test