From 182319d58cc36c7de4de88041df993658a18316c Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Tue, 21 Jul 2020 15:14:30 -0400 Subject: [PATCH] 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 (cherry picked from commit 18e3c7a0a2f5ff1f2482e519178a00cec0c81420) --- roles/ceph-handler/handlers/main.yml | 7 +++++++ roles/ceph-handler/tasks/check_running_containers.yml | 9 ++++++++- roles/ceph-handler/tasks/check_socket_non_container.yml | 9 ++++++++- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/roles/ceph-handler/handlers/main.yml b/roles/ceph-handler/handlers/main.yml index e375c9414..2d85d1fbf 100644 --- a/roles/ceph-handler/handlers/main.yml +++ b/roles/ceph-handler/handlers/main.yml @@ -59,3 +59,10 @@ - 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, []) diff --git a/roles/ceph-handler/tasks/check_running_containers.yml b/roles/ceph-handler/tasks/check_running_containers.yml index 86d488de6..32d90f4a1 100644 --- 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 20f33efc8..d17a5890d 100644 --- 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 -- 2.39.5