osd: make the 'wait for all osd to be up' task configurable

introduce two new variables to make the check that 'wait for all osd to
be up' configurable.
It's possible that for some deployments, OSDs can take longer to be seen
as UP and IN.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1676763
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/group_vars/osds.yml.sample b/group_vars/osds.yml.sample
index 03b006c25308135416f0c30106c22e90ad8f94df..937b4771bd290b55d842a43de91a406fd2376ec4 100644 (file)
--- a/group_vars/osds.yml.sample
+++ b/group_vars/osds.yml.sample
@@ -266,3 +266,10 @@ dummy:
 #  Service:
 #    PrivateDevices: False
 
+
+###########
+#  CHECK  #
+###########
+
+#nb_retry_wait_osd_up: 60
+#delay_wait_osd_up: 10

diff --git a/roles/ceph-osd/defaults/main.yml b/roles/ceph-osd/defaults/main.yml
index fdb3912ba58394f36c362185e5dc935923767804..ffef34956bfa2dbec53719f38733c48a2252e0f9 100644 (file)
--- a/roles/ceph-osd/defaults/main.yml
+++ b/roles/ceph-osd/defaults/main.yml
@@ -257,3 +257,11 @@ ceph_osd_docker_run_script_path: "/usr/share" # script called by systemd to run
 #ceph_osd_systemd_overrides:
 #  Service:
 #    PrivateDevices: False
+
+
+###########
+#  CHECK  #
+###########
+
+nb_retry_wait_osd_up: 60
+delay_wait_osd_up: 10
\ No newline at end of file

diff --git a/roles/ceph-osd/tasks/openstack_config.yml b/roles/ceph-osd/tasks/openstack_config.yml
index 7863583a561688fa5aea920f42465dad2f3b1218..632ce815c514e5bb15dd0c5133737abf092f72ba 100644 (file)
--- a/roles/ceph-osd/tasks/openstack_config.yml
+++ b/roles/ceph-osd/tasks/openstack_config.yml
@@ -5,8 +5,8 @@
     test "$({{ hostvars[groups[mon_group_name][0]]['docker_exec_cmd'] | default('') }} ceph --cluster {{ cluster }} -s -f json | python -c 'import sys, json; print(json.load(sys.stdin)["osdmap"]["osdmap"]["num_osds"])')" =
     "$({{ hostvars[groups[mon_group_name][0]]['docker_exec_cmd'] | default('') }} ceph --cluster {{ cluster }} -s -f json | python -c 'import sys, json; print(json.load(sys.stdin)["osdmap"]["osdmap"]["num_up_osds"])')"
   register: wait_for_all_osds_up
-  retries: 30
-  delay: 10
+  retries: "{{ nb_retry_wait_osd_up }}"
+  delay: "{{ delay_wait_osd_up }}"
   changed_when: false
   delegate_to: "{{ groups[mon_group_name][0] }}"
   until: wait_for_all_osds_up.rc == 0