mgr/cephadm: add mon

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 acb0f41f8020b0472e20ad02f92e9e1b16b4aa2d..648d01adcf45ab916e3bfaf2714e11d87123a514 100644 (file)
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -1869,6 +1869,31 @@ class CephadmOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin):
                                    keyring=keyring,
                                    extra_config=extra_config)
 
+    def add_mon(self, spec):
+        # type: (orchestrator.ServiceSpec) -> orchestrator.Completion
+
+        # current support requires a network to be specified
+        for host, network, _ in spec.placement.hosts:
+            if not network:
+                raise RuntimeError("Host '{}' is missing a network spec".format(host))
+
+        def add_mons(daemons):
+            for _, _, name in spec.placement.hosts:
+                if name and len([d for d in daemons if d.daemon_id == name]):
+                    raise RuntimeError('name %s already exists', name)
+
+            # explicit placement: enough hosts provided?
+            if len(spec.placement.hosts) < spec.count:
+                raise RuntimeError("Error: {} hosts provided, expected {}".format(
+                    len(spec.placement.hosts), spec.count))
+            self.log.info("creating {} monitors on hosts: '{}'".format(
+                spec.count, ",".join(map(lambda h: ":".join(h), spec.placement.hosts))))
+            # TODO: we may want to chain the creation of the monitors so they join
+            # the quorum one at a time.
+            return self._create_mon(spec.placement.hosts)
+
+        return self._get_daemons('mon').then(add_mons)
+
     def update_mons(self, spec):
         # type: (orchestrator.ServiceSpec) -> orchestrator.Completion
         """