From f3f68d8b6de7faeaa6b4d9cbe6a0d08ec406709c Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 15 Oct 2019 11:29:30 -0400 Subject: [PATCH] qa/rgw: use config overrides for vault kms backend Signed-off-by: Casey Bodley --- qa/suites/rgw/crypt/2-kms/vault.yaml | 5 +++++ qa/tasks/rgw.py | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/qa/suites/rgw/crypt/2-kms/vault.yaml b/qa/suites/rgw/crypt/2-kms/vault.yaml index dd9d0b01cf575..b7168acfe19d7 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 46beda900eab8..2f6de79a94e08 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 ]) -- 2.39.5