From: Sage Weil <sage@newdream.net>
Date: Wed, 3 Nov 2021 21:35:58 +0000 (-0500)
Subject: mgr/rook: fix service_type filtering vs crash
X-Git-Tag: v17.1.0~469^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ccbc38c1a72d0d8392f0d50c8253422a30fb8927;p=ceph.git

mgr/rook: fix service_type filtering vs crash

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/pybind/mgr/rook/module.py b/src/pybind/mgr/rook/module.py
index 4ba044413a2..294d1ffbf00 100644
--- a/src/pybind/mgr/rook/module.py
+++ b/src/pybind/mgr/rook/module.py
@@ -279,7 +279,11 @@ class RookOrchestrator(MgrModule, orchestrator.Orchestrator):
                 container_image_name=image_name,
                 last_refresh=now,
             )
-        if not cl['spec'].get('crashCollector', {}).get('disable', False):
+
+        if (
+            service_type == 'crash' or service_type is None
+            and not cl['spec'].get('crashCollector', {}).get('disable', False)
+        ):
             spec['crash'] = orchestrator.ServiceDescription(
                 spec=ServiceSpec(
                     'crash',