From: Teoman ONAY <tonay@redhat.com>
Date: Wed, 6 Apr 2022 09:32:17 +0000 (+0200)
Subject: ceph cephadm set-user does not reflect the user change in ssh-config
X-Git-Tag: v17.2.1~73^2~31
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c878dfecf7fa4b45248e95ca47d6e19ac187d49d;p=ceph.git

ceph cephadm set-user does not reflect the user change in ssh-config

Fixes: https://tracker.ceph.com/issues/54618

Signed-off-by: Teoman ONAY <tonay@redhat.com>
(cherry picked from commit 071f72a734ce207e5cb2ff6d3d996e45396f5c7a)
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index eacf83f978af..5ae3deda07f3 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -953,6 +953,9 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule,
             return 0, "value unchanged", ""
 
         self._validate_and_set_ssh_val('ssh_user', user, current_user)
+        current_ssh_config = self._get_ssh_config()
+        new_ssh_config = re.sub(r"(\s{2}User\s)(.*)", r"\1" + user, current_ssh_config.stdout)
+        self._set_ssh_config(new_ssh_config)
 
         msg = 'ssh user set to %s' % user
         if user != 'root':