mgr/orch: add 'daemon add mgr'

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

diff --git a/src/pybind/mgr/orchestrator.py b/src/pybind/mgr/orchestrator.py
index 2c21ed518b9b2979c4dea03672e6fa4384cfff19..268c475f9e3e6f47d5bb12cc82f57d75545c0e3f 100644 (file)
--- a/src/pybind/mgr/orchestrator.py
+++ b/src/pybind/mgr/orchestrator.py
@@ -960,6 +960,11 @@ class Orchestrator(object):
         """
         raise NotImplementedError()
 
+    def add_mgr(self, spec):
+        # type: (ServiceSpec) -> Completion
+        """Create a new mgr daemon"""
+        raise NotImplementedError()
+
     def add_mds(self, spec):
         # type: (ServiceSpec) -> Completion
         """Create a new MDS cluster"""

diff --git a/src/pybind/mgr/orchestrator_cli/module.py b/src/pybind/mgr/orchestrator_cli/module.py
index 9e07c10905160aa4f4f142eeec5233f22188548b..ff97221c483a21ddd7360e40fb798cea6d577e25 100644 (file)
--- a/src/pybind/mgr/orchestrator_cli/module.py
+++ b/src/pybind/mgr/orchestrator_cli/module.py
@@ -387,6 +387,19 @@ Usage:
         orchestrator.raise_if_exception(completion)
         return HandleCommandResult(stdout=completion.result_str())
 
+    @orchestrator._cli_write_command(
+        'orch daemon add mgr',
+        "name=num,type=CephInt,req=false "
+        "name=hosts,type=CephString,n=N,req=false",
+        'Start rbd-mirror daemon(s)')
+    def _daemon_add_mgr(self, num=None, hosts=None):
+        spec = orchestrator.ServiceSpec(
+            placement=orchestrator.PlacementSpec(hosts=hosts, count=num))
+        completion = self.add_mgr(spec)
+        self._orchestrator_wait([completion])
+        orchestrator.raise_if_exception(completion)
+        return HandleCommandResult(stdout=completion.result_str())
+
     @orchestrator._cli_write_command(
         'orch daemon add rbd-mirror',
         "name=num,type=CephInt,req=false "