From: Sage Weil <sage@redhat.com>
Date: Thu, 19 Dec 2019 20:33:14 +0000 (-0600)
Subject: mgr/cephadm: no need to _get_connection from _create_daemon
X-Git-Tag: v15.1.0~403^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6de3e6b03fd2eae294f951cb6a5de46761c8531f;p=ceph.git

mgr/cephadm: no need to _get_connection from _create_daemon

This is leftover from ages ago; we don't use conn in this context.

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

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 810d24fc4de..0649736cbe1 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -1039,46 +1039,36 @@ class CephadmOrchestrator(MgrModule, orchestrator.Orchestrator):
 
     def _create_daemon(self, daemon_type, daemon_id, host, keyring,
                        extra_args=[]):
-        conn = self._get_connection(host)
-        try:
-            name = '%s.%s' % (daemon_type, daemon_id)
-
-            # generate config
-            ret, config, err = self.mon_command({
-                "prefix": "config generate-minimal-conf",
-            })
-
-            ret, crash_keyring, err = self.mon_command({
-                'prefix': 'auth get-or-create',
-                'entity': 'client.crash.%s' % host,
-                'caps': ['mon', 'profile crash',
-                         'mgr', 'profile crash'],
-            })
-
-            j = json.dumps({
-                'config': config,
-                'keyring': keyring,
-                'crash_keyring': crash_keyring,
-            })
+        name = '%s.%s' % (daemon_type, daemon_id)
 
-            out, err, code = self._run_cephadm(
-                host, name, 'deploy',
-                [
-                    '--name', name,
-                    '--config-and-keyrings', '-',
-                ] + extra_args,
-                stdin=j)
-            self.log.debug('create_daemon code %s out %s' % (code, out))
-            self.service_cache.invalidate(host)
-            return "(Re)deployed {} on host '{}'".format(name, host)
+        # generate config
+        ret, config, err = self.mon_command({
+            "prefix": "config generate-minimal-conf",
+        })
 
-        except Exception as e:
-            self.log.error("create_daemon({}): error: {}".format(host, e))
-            raise
+        ret, crash_keyring, err = self.mon_command({
+            'prefix': 'auth get-or-create',
+            'entity': 'client.crash.%s' % host,
+            'caps': ['mon', 'profile crash',
+                     'mgr', 'profile crash'],
+        })
 
-        finally:
-            self.log.info("create_daemon({}): finished".format(host))
-            conn.exit()
+        j = json.dumps({
+            'config': config,
+            'keyring': keyring,
+            'crash_keyring': crash_keyring,
+        })
+
+        out, err, code = self._run_cephadm(
+            host, name, 'deploy',
+            [
+                '--name', name,
+                '--config-and-keyrings', '-',
+            ] + extra_args,
+            stdin=j)
+        self.log.debug('create_daemon code %s out %s' % (code, out))
+        self.service_cache.invalidate(host)
+        return "(Re)deployed {} on host '{}'".format(name, host)
 
     @async_map_completion
     def _remove_daemon(self, name, host):