From: Michael Fritch <mfritch@suse.com>
Date: Mon, 24 Feb 2020 14:50:05 +0000 (-0700)
Subject: mgr/orchestrator: rearrange interface to match impl. order
X-Git-Tag: v15.2.1~19^2~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a2df42cca8d3ab59653ed42bac6d345a2e28d40c;p=ceph.git

mgr/orchestrator: rearrange interface to match impl. order

rgw impl. happens before rbd impl

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

diff --git a/src/pybind/mgr/orchestrator/_interface.py b/src/pybind/mgr/orchestrator/_interface.py
index d72d8af97eb..329f0a1bc1c 100644
--- a/src/pybind/mgr/orchestrator/_interface.py
+++ b/src/pybind/mgr/orchestrator/_interface.py
@@ -1012,6 +1012,16 @@ class Orchestrator(object):
         """Update MDS cluster"""
         raise NotImplementedError()
 
+    def add_rgw(self, spec):
+        # type: (RGWSpec) -> Completion
+        """Create RGW daemon(s)"""
+        raise NotImplementedError()
+
+    def apply_rgw(self, spec):
+        # type: (RGWSpec) -> Completion
+        """Update RGW cluster"""
+        raise NotImplementedError()
+
     def add_rbd_mirror(self, spec):
         # type: (ServiceSpec) -> Completion
         """Create rbd-mirror daemon(s)"""
@@ -1032,16 +1042,6 @@ class Orchestrator(object):
         """Update NFS cluster"""
         raise NotImplementedError()
 
-    def add_rgw(self, spec):
-        # type: (RGWSpec) -> Completion
-        """Create RGW daemon(s)"""
-        raise NotImplementedError()
-
-    def apply_rgw(self, spec):
-        # type: (RGWSpec) -> Completion
-        """Update RGW cluster"""
-        raise NotImplementedError()
-
     def add_prometheus(self, spec):
         # type: (ServiceSpec) -> Completion
         """Create new prometheus daemon"""