From df1751aecbd6b73ac7acd6a88e7ec90a1e3742cf Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 14 May 2019 08:30:59 -0400 Subject: [PATCH] qa/rgw: add dnsmasq back to s3a-hadoop Signed-off-by: Casey Bodley (cherry picked from commit 8c8a706b6f4cb3b2a5b89aa1eb06b7e47909852d) --- qa/suites/rgw/hadoop-s3a/s3a-hadoop.yaml | 3 +++ qa/tasks/s3a_hadoop.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/qa/suites/rgw/hadoop-s3a/s3a-hadoop.yaml b/qa/suites/rgw/hadoop-s3a/s3a-hadoop.yaml index d9bf9f28e2a6c..ed077a89f1969 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 d4c61a2b6b338..123e739537bfc 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 -- 2.39.5