From 7105fa6cfe1853edd84fc53acfacf48c40c040ca Mon Sep 17 00:00:00 2001 From: Marcus Watts Date: Tue, 3 Nov 2020 18:17:28 -0500 Subject: [PATCH] rgw/kms/kmip - rgw / kmip test integration. Pass endpoint configuration from pykmip to radosgw at runtime. Signed-off-by: Marcus Watts --- qa/tasks/rgw.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/qa/tasks/rgw.py b/qa/tasks/rgw.py index 220165661819..d45fe6e03fd5 100644 --- a/qa/tasks/rgw.py +++ b/qa/tasks/rgw.py @@ -112,6 +112,7 @@ def start_rgw(ctx, config, clients): vault_role = client_config.get('use-vault-role', None) barbican_role = client_config.get('use-barbican-role', None) + pykmip_role = client_config.get('use-pykmip-role', None) token_path = teuthology.get_testdir(ctx) + '/vault-token' if barbican_role is not None: @@ -142,6 +143,12 @@ def start_rgw(ctx, config, clients): '--rgw_crypt_vault_addr', "{}:{}".format(*ctx.vault.endpoints[vault_role]), '--rgw_crypt_vault_token_file', token_path ]) + elif pykmip_role is not None: + if not hasattr(ctx, 'pykmip'): + raise ConfigError('rgw must run after the pykmip task') + rgw_cmd.extend([ + '--rgw_crypt_kmip_addr', "{}:{}".format(*ctx.pykmip.endpoints[pykmip_role]), + ]) rgw_cmd.extend([ '--foreground', -- 2.47.3