From 57342f5373b9331007aa9bf4e54e941bc08ba031 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Wed, 1 Jul 2026 09:06:22 -0400 Subject: [PATCH 1/2] qa: pykmip task defaults to ceph fork point the pykmip task to the ceph fork of the PyKMIP repo, which carries fixes for newer python Signed-off-by: Casey Bodley --- qa/tasks/pykmip.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa/tasks/pykmip.py b/qa/tasks/pykmip.py index 542691095a1..f413aae7fd6 100644 --- a/qa/tasks/pykmip.py +++ b/qa/tasks/pykmip.py @@ -65,7 +65,7 @@ def download(ctx, config): for (client, cconf) in config.items(): branch = cconf.get('force-branch', 'master') - repo = cconf.get('force-repo', 'https://github.com/OpenKMIP/PyKMIP') + repo = cconf.get('force-repo', 'https://github.com/ceph/PyKMIP') sha1 = cconf.get('sha1') log.info("Using branch '%s' for pykmip", branch) log.info('sha1=%s', sha1) From c63915350ff7e647b2c9cb9a41c17f5e8a8c03ee Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 30 Jun 2026 09:33:35 -0400 Subject: [PATCH 2/2] Revert "Reapply "qa/rgw/crypt: disable failing kmip testing"" This reverts commit d27261d0c2641e92365cf590684567c58bbfb905. Fixes: https://tracker.ceph.com/issues/77873 Signed-off-by: Casey Bodley --- qa/suites/rgw/crypt/2-kms/kmip.yaml | 37 +++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 qa/suites/rgw/crypt/2-kms/kmip.yaml diff --git a/qa/suites/rgw/crypt/2-kms/kmip.yaml b/qa/suites/rgw/crypt/2-kms/kmip.yaml new file mode 100644 index 00000000000..0057d954e32 --- /dev/null +++ b/qa/suites/rgw/crypt/2-kms/kmip.yaml @@ -0,0 +1,37 @@ +overrides: + ceph: + conf: + client: + rgw crypt s3 kms backend: kmip + rgw crypt kmip ca path: /etc/ceph/kmiproot.crt + rgw crypt kmip client cert: /etc/ceph/kmip-client.crt + rgw crypt kmip client key: /etc/ceph/kmip-client.key + rgw crypt kmip kms key template: pykmip-$keyid + rgw: + client.0: + use-pykmip-role: client.0 + +tasks: +- openssl_keys: + kmiproot: + client: client.0 + cn: kmiproot + key-type: rsa:4096 + kmip-server: + client: client.0 + ca: kmiproot + kmip-client: + client: client.0 + ca: kmiproot + cn: rgw-client +- exec: + client.0: + - chmod 644 /home/ubuntu/cephtest/ca/kmip-client.key +- pykmip: + client.0: + clientca: kmiproot + servercert: kmip-server + clientcert: kmip-client + secrets: + - name: pykmip-my-key-1 + - name: pykmip-my-key-2