mirror of https://github.com/ceph/ceph-ansible.git
Merge pull request #1001 from ceph/timeout-upgrade
upgrade: add custom timeout optionspull/1004/head
commit
898fed7627
|
@ -59,6 +59,8 @@
|
||||||
vars:
|
vars:
|
||||||
upgrade_ceph_packages: True
|
upgrade_ceph_packages: True
|
||||||
mon_group_name: mons
|
mon_group_name: mons
|
||||||
|
health_mon_check_retries: 5
|
||||||
|
health_mon_check_delay: 10
|
||||||
|
|
||||||
roles:
|
roles:
|
||||||
- ceph-common
|
- ceph-common
|
||||||
|
@ -95,8 +97,8 @@
|
||||||
ceph -s --cluster {{ cluster }} | grep monmap | sed 's/.*quorum//' | egrep -sq {{ ansible_hostname }}
|
ceph -s --cluster {{ cluster }} | grep monmap | sed 's/.*quorum//' | egrep -sq {{ ansible_hostname }}
|
||||||
register: result
|
register: result
|
||||||
until: result.rc == 0
|
until: result.rc == 0
|
||||||
retries: 5
|
retries: "{{ health_mon_check_retries }}"
|
||||||
delay: 10
|
delay: "{{ health_mon_check_delay }}"
|
||||||
delegate_to: "{{ mon_host }}"
|
delegate_to: "{{ mon_host }}"
|
||||||
|
|
||||||
|
|
||||||
|
@ -106,6 +108,8 @@
|
||||||
vars:
|
vars:
|
||||||
upgrade_ceph_packages: True
|
upgrade_ceph_packages: True
|
||||||
osd_group_name: osds
|
osd_group_name: osds
|
||||||
|
health_osd_check_retries: 10
|
||||||
|
health_osd_check_delay: 10
|
||||||
|
|
||||||
pre_tasks:
|
pre_tasks:
|
||||||
- name: set osd flags
|
- name: set osd flags
|
||||||
|
@ -151,8 +155,8 @@
|
||||||
test "$(ceph pg stat --cluster {{ cluster }} | sed 's/^.*pgs://;s/active+clean.*//;s/ //')" -eq "$(ceph pg stat --cluster {{ cluster }} | sed 's/pgs.*//;s/^.*://;s/ //')" && ceph health --cluster {{ cluster }} | egrep -sq "HEALTH_OK|HEALTH_WARN"
|
test "$(ceph pg stat --cluster {{ cluster }} | sed 's/^.*pgs://;s/active+clean.*//;s/ //')" -eq "$(ceph pg stat --cluster {{ cluster }} | sed 's/pgs.*//;s/^.*://;s/ //')" && ceph health --cluster {{ cluster }} | egrep -sq "HEALTH_OK|HEALTH_WARN"
|
||||||
register: result
|
register: result
|
||||||
until: result.rc == 0
|
until: result.rc == 0
|
||||||
retries: 10
|
retries: "{{ health_osd_check_retries }}"
|
||||||
delay: 10
|
delay: "{{ health_osd_check_delay }}"
|
||||||
delegate_to: "{{ groups.mons[0] }}"
|
delegate_to: "{{ groups.mons[0] }}"
|
||||||
|
|
||||||
- name: unset osd flags
|
- name: unset osd flags
|
||||||
|
|
Loading…
Reference in New Issue