]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: reconfig ssh after setting or clearing ssh_config
authorKiefer Chang <kiefer.chang@suse.com>
Mon, 29 Jun 2020 06:53:17 +0000 (14:53 +0800)
committerSebastian Wagner <sebastian.wagner@suse.com>
Tue, 14 Jul 2020 09:39:06 +0000 (11:39 +0200)
Fixes: https://tracker.ceph.com/issues/46245
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit 027b4e154a70b82408de1b19d34a7d4706acded7)

src/pybind/mgr/cephadm/module.py

index 6ecb117be57fdc0eb857c0f17834c032ad7f3e49..dfd047dfa3c398525fdab359fb91e5fff03f54d2 100644 (file)
@@ -683,6 +683,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
             return -errno.EINVAL, "", "empty ssh config provided"
         self.set_store("ssh_config", inbuf)
         self.log.info('Set ssh_config')
+        self._reconfig_ssh()
         return 0, "", ""
 
     @orchestrator._cli_write_command(
@@ -695,6 +696,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
         self.set_store("ssh_config", None)
         self.ssh_config_tmp = None
         self.log.info('Cleared ssh_config')
+        self._reconfig_ssh()
         return 0, "", ""
 
     @orchestrator._cli_read_command(