From: Sage Weil <sage@redhat.com>
Date: Tue, 1 Oct 2019 16:37:52 +0000 (-0500)
Subject: mgr/ssh: use _run_ceph_daemon for _create_daemon
X-Git-Tag: v15.1.0~1313^2~33
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e463475a41f4a4b5b6726700047383deac59b53f;p=ceph.git

mgr/ssh: use _run_ceph_daemon for _create_daemon

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/pybind/mgr/ssh/module.py b/src/pybind/mgr/ssh/module.py
index 3139d41ef96..1b5b8b4b3b5 100644
--- a/src/pybind/mgr/ssh/module.py
+++ b/src/pybind/mgr/ssh/module.py
@@ -555,19 +555,8 @@ class SSHOrchestrator(MgrModule, orchestrator.Orchestrator):
     def _create_daemon(self, daemon_type, host, keyring, network=None):
         conn = self._get_connection(host)
         try:
-            monmap = self.get('mon_map')
-            fsid = monmap['fsid']
             name = '%s.%s' % (daemon_type, host)
 
-            # get container image
-            ret, image, err = self.mon_command({
-                'prefix': 'config get',
-                'who': name,
-                'key': 'image',
-            })
-            image = image.strip()
-            self.log.debug('%s container image %s' % (name, image))
-
             # generate config
             ret, config, err = self.mon_command({
                 "prefix": "config generate-minimal-conf",
@@ -588,14 +577,12 @@ class SSHOrchestrator(MgrModule, orchestrator.Orchestrator):
             extra_args = []
             if network:
                 extra_args += ['--mon-network', network]
-            remoto.process.run(conn, [
-                '/home/sage/src/ceph5/src/ceph-daemon',
-                '--image', image,
-                'deploy',
-                '--fsid', fsid,
-                '--name', name,
-                '--config-and-keyring', '/tmp/foo',
-            ] + extra_args)
+            self._run_ceph_daemon(
+                host, name, 'deploy',
+                [
+                    '--name', name,
+                    '--config-and-keyring', '/tmp/foo'
+                ] + extra_args)
 
             return "Created {} on host '{}'".format(name, host)