Skip to content

Commit

Permalink
ceph-handler: add missing condition on ceph-crash
Browse files Browse the repository at this point in the history
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>
(cherry picked from commit 18e3c7a)
  • Loading branch information
dsavineau committed Jul 22, 2020
1 parent c0b32e4 commit c694454
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 2 deletions.
7 changes: 7 additions & 0 deletions roles/ceph-handler/handlers/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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, [])
9 changes: 8 additions & 1 deletion roles/ceph-handler/tasks/check_running_containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,11 @@
register: ceph_crash_container_stat
changed_when: false
failed_when: false
check_mode: no
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, [])
9 changes: 8 additions & 1 deletion roles/ceph-handler/tasks/check_socket_non_container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -222,4 +222,11 @@
changed_when: false
failed_when: false
check_mode: no
register: crash_process
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, [])

0 comments on commit c694454

Please sign in to comment.