]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/rook: fix service_type filtering vs crash
authorSage Weil <sage@newdream.net>
Wed, 3 Nov 2021 21:35:58 +0000 (16:35 -0500)
committerSage Weil <sage@newdream.net>
Mon, 8 Nov 2021 19:30:16 +0000 (13:30 -0600)
Signed-off-by: Sage Weil <sage@newdream.net>
src/pybind/mgr/rook/module.py

index 4ba044413a2654aba1927a2ed5c7b6e0f355df27..294d1ffbf0039c339bb3b6cc8b8fed2c7012bc40 100644 (file)
@@ -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',