From 30200802d97abf56c09ebd39f64184b2b4622c50 Mon Sep 17 00:00:00 2001
From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Thu, 19 Dec 2019 11:29:41 +0100
Subject: [PATCH] handler: fix bug

411bd07d54fc3f585296b68f2fd04484328399b5 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>
---
 roles/ceph-handler/tasks/handler_mdss.yml       | 2 +-
 roles/ceph-handler/tasks/handler_mgrs.yml       | 2 +-
 roles/ceph-handler/tasks/handler_mons.yml       | 2 +-
 roles/ceph-handler/tasks/handler_nfss.yml       | 2 +-
 roles/ceph-handler/tasks/handler_osds.yml       | 2 +-
 roles/ceph-handler/tasks/handler_rbdmirrors.yml | 2 +-
 roles/ceph-handler/tasks/handler_rgws.yml       | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/roles/ceph-handler/tasks/handler_mdss.yml b/roles/ceph-handler/tasks/handler_mdss.yml
index 5cc0da3f2..98eaeae78 100644
--- a/roles/ceph-handler/tasks/handler_mdss.yml
+++ b/roles/ceph-handler/tasks/handler_mdss.yml
@@ -14,7 +14,7 @@
 - name: restart ceph mds daemon(s)
   command: /usr/bin/env bash /tmp/restart_mds_daemon.sh
   when:
-    - handler_mds_status | bool
+    - hostvars[item]['handler_mds_status'] | default(False) | bool
     - hostvars[item]['_mds_handler_called'] | default(False) | bool
   with_items: "{{ groups[mds_group_name] }}"
   delegate_to: "{{ item }}"
diff --git a/roles/ceph-handler/tasks/handler_mgrs.yml b/roles/ceph-handler/tasks/handler_mgrs.yml
index 675aa8400..b7abd0cae 100644
--- a/roles/ceph-handler/tasks/handler_mgrs.yml
+++ b/roles/ceph-handler/tasks/handler_mgrs.yml
@@ -14,7 +14,7 @@
 - name: restart ceph mgr daemon(s)
   command: /usr/bin/env bash /tmp/restart_mgr_daemon.sh
   when:
-    - handler_mgr_status | bool
+    - hostvars[item]['handler_mgr_status'] | default(False) | bool
     - hostvars[item]['_mgr_handler_called'] | default(False) | bool
   with_items: "{{ groups[mgr_group_name] }}"
   delegate_to: "{{ item }}"
diff --git a/roles/ceph-handler/tasks/handler_mons.yml b/roles/ceph-handler/tasks/handler_mons.yml
index a6ba2a998..b4543e53b 100644
--- a/roles/ceph-handler/tasks/handler_mons.yml
+++ b/roles/ceph-handler/tasks/handler_mons.yml
@@ -18,7 +18,7 @@
   command: /usr/bin/env bash /tmp/restart_mon_daemon.sh
   when:
     # 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
   with_items: "{{ groups[mon_group_name] }}"
   delegate_to: "{{ item }}"
diff --git a/roles/ceph-handler/tasks/handler_nfss.yml b/roles/ceph-handler/tasks/handler_nfss.yml
index ddda7d3ab..beea2750a 100644
--- a/roles/ceph-handler/tasks/handler_nfss.yml
+++ b/roles/ceph-handler/tasks/handler_nfss.yml
@@ -14,7 +14,7 @@
 - name: restart ceph nfs daemon(s)
   command: /usr/bin/env bash /tmp/restart_nfs_daemon.sh
   when:
-    - handler_nfs_status | bool
+    - hostvars[item]['handler_nfs_status'] | default(False) | bool
     - hostvars[item]['_nfs_handler_called'] | default(False) | bool
   with_items: "{{ groups[nfs_group_name] }}"
   delegate_to: "{{ item }}"
diff --git a/roles/ceph-handler/tasks/handler_osds.yml b/roles/ceph-handler/tasks/handler_osds.yml
index a5c97628b..17354a2c2 100644
--- a/roles/ceph-handler/tasks/handler_osds.yml
+++ b/roles/ceph-handler/tasks/handler_osds.yml
@@ -20,7 +20,7 @@
 - name: restart ceph osds daemon(s)
   command: /usr/bin/env bash /tmp/restart_osd_daemon.sh
   when:
-    - handler_osd_status | bool
+    - hostvars[item]['handler_osd_status'] | default(False) | bool
     - handler_health_osd_check | bool
     - hostvars[item]['_osd_handler_called'] | default(False) | bool
   with_items: "{{ groups[osd_group_name] | intersect(ansible_play_batch) }}"
diff --git a/roles/ceph-handler/tasks/handler_rbdmirrors.yml b/roles/ceph-handler/tasks/handler_rbdmirrors.yml
index fcf1d325b..28ccb6ade 100644
--- a/roles/ceph-handler/tasks/handler_rbdmirrors.yml
+++ b/roles/ceph-handler/tasks/handler_rbdmirrors.yml
@@ -14,7 +14,7 @@
 - name: restart ceph rbd mirror daemon(s)
   command: /usr/bin/env bash /tmp/restart_rbd_mirror_daemon.sh
   when:
-    - handler_rbd_mirror_status | bool
+    - hostvars[item]['handler_rbd_mirror_status'] | default(False) | bool
     - hostvars[item]['_rbdmirror_handler_called'] | default(False) | bool
   with_items: "{{ groups[rbdmirror_group_name] }}"
   delegate_to: "{{ item }}"
diff --git a/roles/ceph-handler/tasks/handler_rgws.yml b/roles/ceph-handler/tasks/handler_rgws.yml
index 12d71f47c..aa3c1bea6 100644
--- a/roles/ceph-handler/tasks/handler_rgws.yml
+++ b/roles/ceph-handler/tasks/handler_rgws.yml
@@ -14,7 +14,7 @@
 - name: restart ceph rgw daemon(s)
   command: /usr/bin/env bash /tmp/restart_rgw_daemon.sh
   when:
-    - handler_rgw_status | bool
+    - hostvars[item]['handler_rgw_status'] | default(False) | bool
     - hostvars[item]['_rgw_handler_called'] | default(False) | bool
   with_items: "{{ groups[rgw_group_name] }}"
   delegate_to: "{{ item }}"