ceph-handler: add missing condition on ceph-crash

The ceph-crash tasks present in the ceph-handler role don't need to be
executed on all nodes.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>

diff --git a/roles/ceph-handler/handlers/main.yml b/roles/ceph-handler/handlers/main.yml
index ea7aec2e509f0fca9d0cd64ba1c05d02b9b6f3f7..ede442c91c9334c12d610a19f11e80e541a1de02 100644 (file)
--- a/roles/ceph-handler/handlers/main.yml
+++ b/roles/ceph-handler/handlers/main.yml
@@ -69,6 +69,13 @@
     - name: ceph crash handler
       include_tasks: handler_crash.yml
       listen: "restart ceph crash"
+      when:
+        - inventory_hostname in groups.get(mon_group_name, [])
+          or inventory_hostname in groups.get(mgr_group_name, [])
+          or inventory_hostname in groups.get(osd_group_name, [])
+          or inventory_hostname in groups.get(mds_group_name, [])
+          or inventory_hostname in groups.get(rgw_group_name, [])
+          or inventory_hostname in groups.get(rbdmirror_group_name, [])
 
     - name: remove tempdir for scripts
       file:

diff --git a/roles/ceph-handler/tasks/check_running_containers.yml b/roles/ceph-handler/tasks/check_running_containers.yml
index 86d488de6648fcde6e31b22f347cd16c4a1fe62f..32d90f4a12612fb604f473a65c3df45b0c2924c7 100644 (file)
--- a/roles/ceph-handler/tasks/check_running_containers.yml
+++ b/roles/ceph-handler/tasks/check_running_containers.yml
@@ -84,4 +84,11 @@
   register: ceph_crash_container_stat
   changed_when: false
   failed_when: false
-  check_mode: no
\ No newline at end of file
+  check_mode: no
+  when:
+    - inventory_hostname in groups.get(mon_group_name, [])
+      or inventory_hostname in groups.get(mgr_group_name, [])
+      or inventory_hostname in groups.get(osd_group_name, [])
+      or inventory_hostname in groups.get(mds_group_name, [])
+      or inventory_hostname in groups.get(rgw_group_name, [])
+      or inventory_hostname in groups.get(rbdmirror_group_name, [])
\ No newline at end of file

diff --git a/roles/ceph-handler/tasks/check_socket_non_container.yml b/roles/ceph-handler/tasks/check_socket_non_container.yml
index 20f33efc848ac6b618001c0c0c4a8c5978ddc147..d17a5890d56aa031472dbd330501206758719497 100644 (file)
--- a/roles/ceph-handler/tasks/check_socket_non_container.yml
+++ b/roles/ceph-handler/tasks/check_socket_non_container.yml
@@ -222,4 +222,11 @@
   changed_when: false
   failed_when: false
   check_mode: no
-  register: crash_process
\ No newline at end of file
+  register: crash_process
+  when:
+    - inventory_hostname in groups.get(mon_group_name, [])
+      or inventory_hostname in groups.get(mgr_group_name, [])
+      or inventory_hostname in groups.get(osd_group_name, [])
+      or inventory_hostname in groups.get(mds_group_name, [])
+      or inventory_hostname in groups.get(rgw_group_name, [])
+      or inventory_hostname in groups.get(rbdmirror_group_name, [])
\ No newline at end of file