From: Michael Fritch <mfritch@suse.com>
Date: Wed, 29 Apr 2020 23:34:37 +0000 (-0600)
Subject: mgr/orch: use `service_type` as the `daemon_type`
X-Git-Tag: wip-pdonnell-testing-20200918.022351~1331^2~7
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=47e078133d546c68be471592f5431e02354c3102;p=ceph-ci.git

mgr/orch: use `service_type` as the `daemon_type`

$ ceph orch add -i mon.yaml
Error ENOENT: unknown daemon type `None`

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

diff --git a/src/pybind/mgr/orchestrator/module.py b/src/pybind/mgr/orchestrator/module.py
index 24398b891f1..3140de83c7a 100644
--- a/src/pybind/mgr/orchestrator/module.py
+++ b/src/pybind/mgr/orchestrator/module.py
@@ -654,6 +654,8 @@ Usage:
 
             spec = ServiceSpec(daemon_type, placement=placement)
 
+        daemon_type = spec.service_type
+
         if daemon_type == 'mon':
             completion = self.add_mon(spec)
         elif daemon_type == 'mgr':