From: Michael Fritch <mfritch@suse.com>
Date: Thu, 20 Aug 2020 20:06:15 +0000 (-0600)
Subject: mgr/cephadm: move NFS config/create func
X-Git-Tag: v17.0.0~1350^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=170220875d942b6f1678d5a388a19e081251f554;p=ceph.git

mgr/cephadm: move NFS config/create func

preserve func order seen in the impl. for the other services

Signed-off-by: Michael Fritch <mfritch@suse.com>
---

diff --git a/src/pybind/mgr/cephadm/services/nfs.py b/src/pybind/mgr/cephadm/services/nfs.py
index 6824053ff20bb..bee266072e8ba 100644
--- a/src/pybind/mgr/cephadm/services/nfs.py
+++ b/src/pybind/mgr/cephadm/services/nfs.py
@@ -18,6 +18,26 @@ logger = logging.getLogger(__name__)
 class NFSService(CephadmService):
     TYPE = 'nfs'
 
+    def config(self, spec: NFSServiceSpec) -> None:
+        assert self.TYPE == spec.service_type
+        self.mgr._check_pool_exists(spec.pool, spec.service_name())
+
+        logger.info('Saving service %s spec with placement %s' % (
+            spec.service_name(), spec.placement.pretty_str()))
+        self.mgr.spec_store.save(spec)
+
+    def create(self, daemon_spec: CephadmDaemonSpec[NFSServiceSpec]) -> str:
+        assert self.TYPE == daemon_spec.daemon_type
+        assert daemon_spec.spec
+
+        daemon_id = daemon_spec.daemon_id
+        host = daemon_spec.host
+        spec = daemon_spec.spec
+
+        logger.info('Create daemon %s on host %s with spec %s' % (
+            daemon_id, host, spec))
+        return self.mgr._create_daemon(daemon_spec)
+
     def generate_config(self, daemon_spec: CephadmDaemonSpec) -> Tuple[Dict[str, Any], List[str]]:
         assert self.TYPE == daemon_spec.daemon_type
 
@@ -69,26 +89,6 @@ class NFSService(CephadmService):
 
         return cephadm_config, deps
 
-    def config(self, spec: NFSServiceSpec) -> None:
-        assert self.TYPE == spec.service_type
-        self.mgr._check_pool_exists(spec.pool, spec.service_name())
-
-        logger.info('Saving service %s spec with placement %s' % (
-            spec.service_name(), spec.placement.pretty_str()))
-        self.mgr.spec_store.save(spec)
-
-    def create(self, daemon_spec: CephadmDaemonSpec[NFSServiceSpec]) -> str:
-        assert self.TYPE == daemon_spec.daemon_type
-        assert daemon_spec.spec
-
-        daemon_id = daemon_spec.daemon_id
-        host = daemon_spec.host
-        spec = daemon_spec.spec
-
-        logger.info('Create daemon %s on host %s with spec %s' % (
-            daemon_id, host, spec))
-        return self.mgr._create_daemon(daemon_spec)
-
     def config_dashboard(self, daemon_descrs: List[DaemonDescription]):
 
         def get_set_cmd_dicts(out: str) -> List[dict]: