From 3700aa5385a986460f49370b9bfcb762c414d54d Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Thu, 30 Jan 2020 11:33:38 +0100 Subject: [PATCH] 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 --- group_vars/all.yml.sample | 8 ++++++++ group_vars/rhcs.yml.sample | 8 ++++++++ ...om-non-containerized-to-containerized-ceph-daemons.yml | 4 ---- roles/ceph-defaults/defaults/main.yml | 8 ++++++++ 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 81716f174..09cbc7321 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -474,6 +474,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 1df810051..9300845af 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -474,6 +474,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 537648750..38134980c 100644 --- 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 c0b6a232b..296993d44 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -466,6 +466,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 # ###############