From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 15 Oct 2019 15:29:30 +0000 (-0400)
Subject: qa/rgw: use config overrides for vault kms backend
X-Git-Tag: v15.1.0~1233^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f3f68d8b6de7faeaa6b4d9cbe6a0d08ec406709c;p=ceph-ci.git

qa/rgw: use config overrides for vault kms backend

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

diff --git a/qa/suites/rgw/crypt/2-kms/vault.yaml b/qa/suites/rgw/crypt/2-kms/vault.yaml
index dd9d0b01cf5..b7168acfe19 100644
--- a/qa/suites/rgw/crypt/2-kms/vault.yaml
+++ b/qa/suites/rgw/crypt/2-kms/vault.yaml
@@ -1,4 +1,9 @@
 overrides:
+  ceph:
+    conf:
+      client:
+        rgw crypt s3 kms backend: vault
+        rgw crypt vault auth: token
   rgw:
     client.0:
       use-vault-role: client.0
diff --git a/qa/tasks/rgw.py b/qa/tasks/rgw.py
index 46beda900ea..2f6de79a94e 100644
--- a/qa/tasks/rgw.py
+++ b/qa/tasks/rgw.py
@@ -140,8 +140,6 @@ def start_rgw(ctx, config, clients):
             ctx.cluster.only(client).run(args=['cat', token_path])
 
             rgw_cmd.extend([
-                '--rgw_crypt_s3_kms_backend', 'vault',
-                '--rgw_crypt_vault_auth', 'token',
                 '--rgw_crypt_vault_addr', "{}:{}".format(*ctx.vault.endpoints[vault_role]),
                 '--rgw_crypt_vault_token_file', token_path
             ])