Merge pull request #35823 from bk201/wip-46245

mgr/cephadm: reconfig ssh after setting or clearing ssh_config

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
This commit is contained in:
Sebastian Wagner 2020-07-02 10:22:32 +02:00 committed by GitHub
commit faf701d787
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -706,6 +706,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(
@ -718,6 +719,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(