RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 02:27:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #41278 from sebastian-philipp/mgr-cephadm-set-user-no-hosts

Browse Source 
mgr/cephadm: Don't call _check_host without hosts

Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Reviewed-by: Adam King <adking@redhat.com>
This commit is contained in:
Kefu Chai 2021-05-29 10:42:14 +08:00 committed by GitHub
commit 2ecb738e2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/pybind/mgr/cephadm/module.py
View File

@ -727,6 +727,20 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule,
return True, err, ret
def _validate_and_set_ssh_val(self, what: str, new: Optional[str], old: Optional[str]) -> None:
self.set_store(what, new)
self._reconfig_ssh()
if self.cache.get_hosts():
# Can't check anything without hosts
host = self.cache.get_hosts()[0]
r = CephadmServe(self)._check_host(host)
if r is not None:
# connection failed reset user
self.set_store(what, old)
self._reconfig_ssh()
raise OrchestratorError('ssh connection %s@%s failed' % (self.ssh_user, host))
self.log.info(f'Set ssh {what}')
@orchestrator._cli_write_command(
prefix='cephadm set-ssh-config')
def _set_ssh_config(self, inbuf: Optional[str] = None) -> Tuple[int, str, str]:
@ -735,12 +749,11 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule,
"""
# Set an ssh_config file provided from stdin
if inbuf == self.ssh_config:
old = self.ssh_config
if inbuf == old:
return 0, "value unchanged", ""
self.validate_ssh_config_content(inbuf)
self.set_store("ssh_config", inbuf)
self.log.info('Set ssh_config')
self._reconfig_ssh()
self._validate_and_set_ssh_val('ssh_config', inbuf, old)
return 0, "", ""
@orchestrator._cli_write_command('cephadm clear-ssh-config')
@ -804,11 +817,11 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule,
"""Set cluster SSH private key (use -i <private_key>)"""
if inbuf is None or len(inbuf) == 0:
return -errno.EINVAL, "", "empty private ssh key provided"
if inbuf == self.ssh_key:
old = self.ssh_key
if inbuf == old:
return 0, "value unchanged", ""
self.set_store("ssh_identity_key", inbuf)
self._validate_and_set_ssh_val('ssh_identity_key', inbuf, old)
self.log.info('Set ssh private key')
self._reconfig_ssh()
return 0, "", ""
@orchestrator._cli_write_command(
@ -817,11 +830,10 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule,
"""Set cluster SSH public key (use -i <public_key>)"""
if inbuf is None or len(inbuf) == 0:
return -errno.EINVAL, "", "empty public ssh key provided"
if inbuf == self.ssh_pub:
old = self.ssh_pub
if inbuf == old:
return 0, "value unchanged", ""
self.set_store("ssh_identity_pub", inbuf)
self.log.info('Set ssh public key')
self._reconfig_ssh()
self._validate_and_set_ssh_val('ssh_identity_pub', inbuf, old)
return 0, "", ""
@orchestrator._cli_write_command(
@ -864,20 +876,11 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule,
if user == current_user:
return 0, "value unchanged", ""
self.set_store('ssh_user', user)
self._reconfig_ssh()
host = self.cache.get_hosts()[0]
r = CephadmServe(self)._check_host(host)
if r is not None:
# connection failed reset user
self.set_store('ssh_user', current_user)
self._reconfig_ssh()
return -errno.EINVAL, '', 'ssh connection %s@%s failed' % (user, host)
self._validate_and_set_ssh_val('ssh_user', user, current_user)
msg = 'ssh user set to %s' % user
if user != 'root':
msg += ' sudo will be used'
msg += '. sudo will be used'
self.log.info(msg)
return 0, msg, ''