switch_to_containers: increase health check values

This commit increases the default values for the following variable
consumed in switch-from-non-containerized-to-containerized-ceph-daemons.yml
playbook.
This also moves these variables in `ceph-defaults` role so the user can
set different values if needed.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1783223
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 3700aa5385a986460f49370b9bfcb762c414d54d)

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 50269980a668351db36b161ae2c3752bf4551c66..010d4bfbf4e8614264d95bd10f6a7bea9f06a758 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -472,6 +472,14 @@ dummy:
 #handler_health_mgr_check_retries: 5
 #handler_health_mgr_check_delay: 10
 
+## health mon/osds check retries/delay:
+
+#health_mon_check_retries: 20
+#health_mon_check_delay: 10
+#health_osd_check_retries: 20
+#health_osd_check_delay: 10
+
+
 ###############
 # NFS-GANESHA #
 ###############

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 5c5ca99af4d4a1d3a06c9291025c1a1c63538d7f..94e013a439754fda97b751029f1ad24ca46e3fcc 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -472,6 +472,14 @@ ceph_iscsi_config_dev: false
 #handler_health_mgr_check_retries: 5
 #handler_health_mgr_check_delay: 10
 
+## health mon/osds check retries/delay:
+
+#health_mon_check_retries: 20
+#health_mon_check_delay: 10
+#health_osd_check_retries: 20
+#health_osd_check_delay: 10
+
+
 ###############
 # NFS-GANESHA #
 ###############

diff --git a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
index 537648750354e603796983fc89a42f0f88d84965..38134980c80595b2d3990f0a6c5d6d21c378edbe 100644 (file)
--- a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
+++ b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
@@ -56,8 +56,6 @@
 
 - name: switching from non-containerized to containerized ceph mon
   vars:
-    health_mon_check_retries: 5
-    health_mon_check_delay: 15
     containerized_deployment: true
     switch_to_containers: True
     mon_group_name:       mons
@@ -197,8 +195,6 @@
 - name: switching from non-containerized to containerized ceph osd
 
   vars:
-    health_osd_check_retries: 5
-    health_osd_check_delay: 15
     containerized_deployment: true
     osd_group_name: osds
 

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index c697e09ac8fd1a2b0f94633ca29b455f3c267a27..3b76963ecc432e14f331cae4a30a326a6f7c4f70 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -464,6 +464,14 @@ handler_health_rbd_mirror_check_delay: 10
 handler_health_mgr_check_retries: 5
 handler_health_mgr_check_delay: 10
 
+## health mon/osds check retries/delay:
+
+health_mon_check_retries: 20
+health_mon_check_delay: 10
+health_osd_check_retries: 20
+health_osd_check_delay: 10
+
+
 ###############
 # NFS-GANESHA #
 ###############