From aa283c5464d38f5aa619db1c9ecb3536c8b0f1b4 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 15 Oct 2019 11:07:35 -0400 Subject: [PATCH] qa/rgw: use config overrides for 'testing' kms backend and configure the 'testing' backend for the rgw/verify suite Signed-off-by: Casey Bodley --- qa/suites/rgw/crypt/2-kms/testing.yaml | 8 +++++--- qa/suites/rgw/verify/overrides.yaml | 1 + qa/tasks/rgw.py | 6 ------ 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/qa/suites/rgw/crypt/2-kms/testing.yaml b/qa/suites/rgw/crypt/2-kms/testing.yaml index 73799c633f2..e02f9caad99 100644 --- a/qa/suites/rgw/crypt/2-kms/testing.yaml +++ b/qa/suites/rgw/crypt/2-kms/testing.yaml @@ -1,4 +1,6 @@ overrides: - rgw: - client.0: - use-testing-role: client.0 + ceph: + conf: + client: + rgw crypt s3 kms backend: testing + rgw crypt s3 kms encryption_keys: testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo= testkey-2=aWIKTWFrZWZpbGUKbWFuCm91dApzcmMKVGVzdGluZwo= diff --git a/qa/suites/rgw/verify/overrides.yaml b/qa/suites/rgw/verify/overrides.yaml index 8b0b5cff0a3..12d32becaca 100644 --- a/qa/suites/rgw/verify/overrides.yaml +++ b/qa/suites/rgw/verify/overrides.yaml @@ -3,6 +3,7 @@ overrides: conf: client: debug rgw: 20 + rgw crypt s3 kms backend: testing rgw crypt s3 kms encryption keys: testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo= testkey-2=aWIKTWFrZWZpbGUKbWFuCm91dApzcmMKVGVzdGluZwo= rgw crypt require ssl: false rgw: diff --git a/qa/tasks/rgw.py b/qa/tasks/rgw.py index b3a1c3164cc..f5648733a64 100644 --- a/qa/tasks/rgw.py +++ b/qa/tasks/rgw.py @@ -115,7 +115,6 @@ def start_rgw(ctx, config, clients): vault_role = client_config.get('use-vault-role', None) - testing_role = client_config.get('use-testing-role', None) barbican_role = client_config.get('use-barbican-role', None) token_path = teuthology.get_testdir(ctx) + '/vault-token' @@ -155,11 +154,6 @@ def start_rgw(ctx, config, clients): '--rgw_crypt_vault_addr', "{}:{}".format(*ctx.vault.endpoints[vault_role]), '--rgw_crypt_vault_token_file', token_path ]) - elif testing_role is not None: - rgw_cmd.extend([ - '--rgw_crypt_s3_kms_backend', 'testing', - '--rgw_crypt_s3_kms_encryption_keys', 'testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo= testkey-2=aWIKTWFrZWZpbGUKbWFuCm91dApzcmMKVGVzdGluZwo=' - ]) rgw_cmd.extend([ '--foreground', -- 2.39.5