From 9811a4242f672ac0de02c3d6cccd7a304b8ddc2c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 1 Oct 2019 14:15:47 -0500 Subject: [PATCH] mgr/ssh: pass daemon id separately to _create_daemon Don't assume it is the hostname (with osds, it's not!). Also, just pass arbitrary args down, instead of special-casing the network option. Signed-off-by: Sage Weil --- src/pybind/mgr/ssh/module.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/pybind/mgr/ssh/module.py b/src/pybind/mgr/ssh/module.py index 1b5b8b4b3b5..49cb68b05bb 100644 --- a/src/pybind/mgr/ssh/module.py +++ b/src/pybind/mgr/ssh/module.py @@ -552,10 +552,11 @@ class SSHOrchestrator(MgrModule, orchestrator.Orchestrator): return SSHWriteCompletion(result) - def _create_daemon(self, daemon_type, host, keyring, network=None): + def _create_daemon(self, daemon_type, daemon_id, host, keyring, + extra_args=[]): conn = self._get_connection(host) try: - name = '%s.%s' % (daemon_type, host) + name = '%s.%s' % (daemon_type, daemon_id) # generate config ret, config, err = self.mon_command({ @@ -574,15 +575,13 @@ class SSHOrchestrator(MgrModule, orchestrator.Orchestrator): j, 0o600, None, 0, 0) - extra_args = [] - if network: - extra_args += ['--mon-network', network] - self._run_ceph_daemon( + out, code = self._run_ceph_daemon( host, name, 'deploy', [ '--name', name, - '--config-and-keyring', '/tmp/foo' + '--config-and-keyring', '/tmp/foo', ] + extra_args) + self.log.debug('create_daemon code %s out %s' % (code, out)) return "Created {} on host '{}'".format(name, host) @@ -607,7 +606,8 @@ class SSHOrchestrator(MgrModule, orchestrator.Orchestrator): }) self.log.debug('mon keyring %s' % keyring) - return self._create_daemon('mon', host, keyring, network=network) + return self._create_daemon('mon', host, host, keyring, + extra_args=['--mon-network', network]) def update_mons(self, num, hosts): """ @@ -665,7 +665,7 @@ class SSHOrchestrator(MgrModule, orchestrator.Orchestrator): }) self.log.debug('keyring %s' % keyring) - return self._create_daemon('mgr', host, keyring) + return self._create_daemon('mgr', host, host, keyring) def update_mgrs(self, num, hosts): """ -- 2.39.5