handler: fix bug

411bd07d54 introduced a bug in handlers

using `handler_*_status` instead of `hostvars[item]['handler_*_status']`
causes handlers to be triggered in anycase even though
`handler_*_status` was set to `False` on a specific node.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1622688

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/4905/head
Guillaume Abrioux 2019-12-19 11:29:41 +01:00 committed by Dimitri Savineau
parent 3c31b19ab3
commit 30200802d9
7 changed files with 7 additions and 7 deletions

View File

@ -14,7 +14,7 @@
- name: restart ceph mds daemon(s) - name: restart ceph mds daemon(s)
command: /usr/bin/env bash /tmp/restart_mds_daemon.sh command: /usr/bin/env bash /tmp/restart_mds_daemon.sh
when: when:
- handler_mds_status | bool - hostvars[item]['handler_mds_status'] | default(False) | bool
- hostvars[item]['_mds_handler_called'] | default(False) | bool - hostvars[item]['_mds_handler_called'] | default(False) | bool
with_items: "{{ groups[mds_group_name] }}" with_items: "{{ groups[mds_group_name] }}"
delegate_to: "{{ item }}" delegate_to: "{{ item }}"

View File

@ -14,7 +14,7 @@
- name: restart ceph mgr daemon(s) - name: restart ceph mgr daemon(s)
command: /usr/bin/env bash /tmp/restart_mgr_daemon.sh command: /usr/bin/env bash /tmp/restart_mgr_daemon.sh
when: when:
- handler_mgr_status | bool - hostvars[item]['handler_mgr_status'] | default(False) | bool
- hostvars[item]['_mgr_handler_called'] | default(False) | bool - hostvars[item]['_mgr_handler_called'] | default(False) | bool
with_items: "{{ groups[mgr_group_name] }}" with_items: "{{ groups[mgr_group_name] }}"
delegate_to: "{{ item }}" delegate_to: "{{ item }}"

View File

@ -18,7 +18,7 @@
command: /usr/bin/env bash /tmp/restart_mon_daemon.sh command: /usr/bin/env bash /tmp/restart_mon_daemon.sh
when: when:
# We do not want to run these checks on initial deployment (`socket.rc == 0`) # We do not want to run these checks on initial deployment (`socket.rc == 0`)
- handler_mon_status | bool - hostvars[item]['handler_mon_status'] | default(False) | bool
- hostvars[item]['_mon_handler_called'] | default(False) | bool - hostvars[item]['_mon_handler_called'] | default(False) | bool
with_items: "{{ groups[mon_group_name] }}" with_items: "{{ groups[mon_group_name] }}"
delegate_to: "{{ item }}" delegate_to: "{{ item }}"

View File

@ -14,7 +14,7 @@
- name: restart ceph nfs daemon(s) - name: restart ceph nfs daemon(s)
command: /usr/bin/env bash /tmp/restart_nfs_daemon.sh command: /usr/bin/env bash /tmp/restart_nfs_daemon.sh
when: when:
- handler_nfs_status | bool - hostvars[item]['handler_nfs_status'] | default(False) | bool
- hostvars[item]['_nfs_handler_called'] | default(False) | bool - hostvars[item]['_nfs_handler_called'] | default(False) | bool
with_items: "{{ groups[nfs_group_name] }}" with_items: "{{ groups[nfs_group_name] }}"
delegate_to: "{{ item }}" delegate_to: "{{ item }}"

View File

@ -20,7 +20,7 @@
- name: restart ceph osds daemon(s) - name: restart ceph osds daemon(s)
command: /usr/bin/env bash /tmp/restart_osd_daemon.sh command: /usr/bin/env bash /tmp/restart_osd_daemon.sh
when: when:
- handler_osd_status | bool - hostvars[item]['handler_osd_status'] | default(False) | bool
- handler_health_osd_check | bool - handler_health_osd_check | bool
- hostvars[item]['_osd_handler_called'] | default(False) | bool - hostvars[item]['_osd_handler_called'] | default(False) | bool
with_items: "{{ groups[osd_group_name] | intersect(ansible_play_batch) }}" with_items: "{{ groups[osd_group_name] | intersect(ansible_play_batch) }}"

View File

@ -14,7 +14,7 @@
- name: restart ceph rbd mirror daemon(s) - name: restart ceph rbd mirror daemon(s)
command: /usr/bin/env bash /tmp/restart_rbd_mirror_daemon.sh command: /usr/bin/env bash /tmp/restart_rbd_mirror_daemon.sh
when: when:
- handler_rbd_mirror_status | bool - hostvars[item]['handler_rbd_mirror_status'] | default(False) | bool
- hostvars[item]['_rbdmirror_handler_called'] | default(False) | bool - hostvars[item]['_rbdmirror_handler_called'] | default(False) | bool
with_items: "{{ groups[rbdmirror_group_name] }}" with_items: "{{ groups[rbdmirror_group_name] }}"
delegate_to: "{{ item }}" delegate_to: "{{ item }}"

View File

@ -14,7 +14,7 @@
- name: restart ceph rgw daemon(s) - name: restart ceph rgw daemon(s)
command: /usr/bin/env bash /tmp/restart_rgw_daemon.sh command: /usr/bin/env bash /tmp/restart_rgw_daemon.sh
when: when:
- handler_rgw_status | bool - hostvars[item]['handler_rgw_status'] | default(False) | bool
- hostvars[item]['_rgw_handler_called'] | default(False) | bool - hostvars[item]['_rgw_handler_called'] | default(False) | bool
with_items: "{{ groups[rgw_group_name] }}" with_items: "{{ groups[rgw_group_name] }}"
delegate_to: "{{ item }}" delegate_to: "{{ item }}"