common: ability to disable handler osd health check

Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 9eb23f1cf7b19153f421f203e3e0993c1c0bd923..e6fccbb3b4d9e847b9d6ddf4d168efa733fba6c9 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -330,6 +330,7 @@ dummy:
 #handler_health_mon_check_delay: 10
 #handler_health_osd_check_retries: 40
 #handler_health_osd_check_delay: 30
+#handler_health_osd_check: true
 
 ###################
 # CONFIG OVERRIDE #

diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index 50bd4b3ddd04057ae0395183612bbddcafc52efd..f20fd3a6cff672069c47176e842fe1ad4be20b78 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -322,6 +322,7 @@ handler_health_mon_check_retries: 5
 handler_health_mon_check_delay: 10
 handler_health_osd_check_retries: 40
 handler_health_osd_check_delay: 30
+handler_health_osd_check: true
 
 ###################
 # CONFIG OVERRIDE #

diff --git a/roles/ceph-common/handlers/validate-osd.yml b/roles/ceph-common/handlers/validate-osd.yml
index b83d0952d0d255a0bf77c4465e5ffaf55d3b9525..99d1c2f871d09e5100ed5795ce8fc6abf5c7f4a8 100644 (file)
--- a/roles/ceph-common/handlers/validate-osd.yml
+++ b/roles/ceph-common/handlers/validate-osd.yml
@@ -17,3 +17,4 @@
   retries: "{{ handler_health_osd_check_retries }}"
   delay: "{{ handler_health_osd_check_delay }}"
   delegate_to: "{{ groups[mon_group_name][0] }}"
+  when: handler_health_osd_check