From: Marcus Watts <mwatts@redhat.com>
Date: Tue, 3 Nov 2020 23:17:28 +0000 (-0500)
Subject: rgw/kms/kmip - rgw / kmip test integration.
X-Git-Tag: v17.1.0~2721^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7105fa6cfe1853edd84fc53acfacf48c40c040ca;p=ceph.git

rgw/kms/kmip - rgw / kmip test integration.

Pass endpoint configuration from pykmip to radosgw at runtime.

Signed-off-by: Marcus Watts <mwatts@redhat.com>
---

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',