From: Michael Fritch <mfritch@suse.com>
Date: Mon, 24 Feb 2020 18:43:07 +0000 (-0700)
Subject: mgr/cephadm: split out `config-and-keyrings` json
X-Git-Tag: v15.2.1~19^2~21
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f97c45a28bbe18395094f80d3423ca1b10ccb0cd;p=ceph.git

mgr/cephadm: split out `config-and-keyrings` json

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 3be608102834bbc7ba5de927ccc868b5b5fb3cad)
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 2ebf9d29bfd..84d861530c9 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -2176,6 +2176,33 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
                 deps.append(dd.name())
         return sorted(deps)
 
+    def _get_config_and_keyring(self, daemon_type, daemon_id,
+                                keyring=None,
+                                extra_config=None):
+        # type: (str, str, Optional[str], Optional[str]) -> Dict[str, Any]
+        # keyring
+        if not keyring:
+            if daemon_type == 'mon':
+                ename = 'mon.'
+            else:
+                ename = name_to_config_section(daemon_type + '.' + daemon_id)
+            ret, keyring, err = self.mon_command({
+                'prefix': 'auth get',
+                'entity': ename,
+            })
+
+        # generate config
+        ret, config, err = self.mon_command({
+            "prefix": "config generate-minimal-conf",
+        })
+        if extra_config:
+            config += extra_config
+
+        return {
+            'config': config,
+            'keyring': keyring,
+        }
+
     def _create_daemon(self, daemon_type, daemon_id, host,
                        keyring=None,
                        extra_args=None, extra_config=None,
@@ -2198,28 +2225,10 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
             cephadm_config, deps = self._generate_alertmanager_config()
             extra_args.extend(['--config-json', '-'])
         else:
-            # keyring
-            if not keyring:
-                if daemon_type == 'mon':
-                    ename = 'mon.'
-                else:
-                    ename = name_to_config_section(daemon_type + '.' + daemon_id)
-                ret, keyring, err = self.mon_command({
-                    'prefix': 'auth get',
-                    'entity': ename,
-                })
-
-            # generate config
-            ret, config, err = self.mon_command({
-                "prefix": "config generate-minimal-conf",
-            })
-            if extra_config:
-                config += extra_config
-
-            cephadm_config = {
-                'config': config,
-                'keyring': keyring,
-            }
+            cephadm_config = self._get_config_and_keyring(
+                    daemon_type, daemon_id,
+                    keyring=keyring,
+                    extra_config=extra_config)
             extra_args.extend(['--config-json', '-'])
 
             # osd deployments needs an --osd-uuid arg