From 39b79c89654568f678755fd44fa7976f73126945 Mon Sep 17 00:00:00 2001 From: Vallari Agrawal Date: Wed, 2 Jul 2025 20:44:03 +0530 Subject: [PATCH 1/2] Rename pubkey if SSH_PRIVKEY_PATH is passed Signed-off-by: Vallari Agrawal --- ceph_devstack/resources/ceph/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ceph_devstack/resources/ceph/__init__.py b/ceph_devstack/resources/ceph/__init__.py index 344cc16a..6792fd7f 100644 --- a/ceph_devstack/resources/ceph/__init__.py +++ b/ceph_devstack/resources/ceph/__init__.py @@ -74,7 +74,7 @@ async def _get_ssh_keys(self): check=True, force_local=True, ) - self.pubkey_path = f"{privkey_path}.pub" + self.pubkey_path = f"{privkey_path}.pub" self.privkey_path = privkey_path From 98095761d2cff8fded8e619577be4c4c28afbe2a Mon Sep 17 00:00:00 2001 From: Vallari Agrawal Date: Wed, 2 Jul 2025 23:14:39 +0530 Subject: [PATCH 2/2] Add SSH_AUTH_SOCK to teuthology container This helps teuthology container to use forwarded agent ssh key. Signed-off-by: Vallari Agrawal --- ceph_devstack/resources/ceph/containers.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ceph_devstack/resources/ceph/containers.py b/ceph_devstack/resources/ceph/containers.py index c36d5b78..d6130fb2 100644 --- a/ceph_devstack/resources/ceph/containers.py +++ b/ceph_devstack/resources/ceph/containers.py @@ -333,6 +333,14 @@ def create_cmd(self): "-v", f"{ansible_inv}/secrets:/etc/ansible/secrets", ] + ssh_auth_socket = os.environ.get("SSH_AUTH_SOCK") + if ssh_auth_socket: + cmd += [ + "-v", + f"{ssh_auth_socket}:{ssh_auth_socket}", + "-e", + f"SSH_AUTH_SOCK={ssh_auth_socket}", + ] cmd += [ "--name", "{name}",