From: Sage Weil <sage@redhat.com>
Date: Wed, 12 Feb 2020 21:48:13 +0000 (-0600)
Subject: mgr/orch: prevent rm mon|mgr
X-Git-Tag: v15.1.1~425^2~6
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=852251cea7441a4d7e987d338f75662864a24a1d;p=ceph-ci.git

mgr/orch: prevent rm mon|mgr

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

diff --git a/src/pybind/mgr/orchestrator_cli/module.py b/src/pybind/mgr/orchestrator_cli/module.py
index f501e7f6bf6..564c6968ae4 100644
--- a/src/pybind/mgr/orchestrator_cli/module.py
+++ b/src/pybind/mgr/orchestrator_cli/module.py
@@ -549,6 +549,8 @@ Usage:
         else:
             service_type = name;
             service_name = None
+        if name in ['mon', 'mgr']:
+            raise orchestrator.OrchestratorError('The mon and mgr services cannot be removed')
         completion = self.remove_service(service_type, service_name)
         self._orchestrator_wait([completion])
         orchestrator.raise_if_exception(completion)