From: Kiefer Chang <kiefer.chang@suse.com>
Date: Mon, 29 Jun 2020 06:53:17 +0000 (+0800)
Subject: mgr/cephadm: reconfig ssh after setting or clearing ssh_config
X-Git-Tag: v16.1.0~1860^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=027b4e154a70b82408de1b19d34a7d4706acded7;p=ceph.git

mgr/cephadm: reconfig ssh after setting or clearing ssh_config

Fixes: https://tracker.ceph.com/issues/46245
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 6ecb117be57f..dfd047dfa3c3 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -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(