ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

osd: do not run openstack_config during upgrade 

There is no need to run this part of the playbook when upgrading the
cluter.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit af6875706a)
pull/4934/head
Guillaume Abrioux 2019-11-08 16:21:54 +01:00 committed by Dimitri Savineau
parent 51596e8b32
commit ffdfa634ac
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
roles/ceph-osd/tasks/main.yml
View File

@ -62,6 +62,14 @@
- name: include_tasks start_osds.yml - name: include_tasks start_osds.yml
include_tasks: start_osds.yml include_tasks: start_osds.yml
- name: unset noup flag
command: "{{ container_exec_cmd | default('') }} ceph --cluster {{ cluster }} osd unset noup"
delegate_to: "{{ groups[mon_group_name][0] }}"
changed_when: False
when:
- not rolling_update | default(False) | bool
- inventory_hostname == ansible_play_hosts_all | last
- name: wait for all osd to be up - name: wait for all osd to be up
command: "{{ container_exec_cmd | default('') }} ceph --cluster {{ cluster }} -s -f json" command: "{{ container_exec_cmd | default('') }} ceph --cluster {{ cluster }} -s -f json"
register: wait_for_all_osds_up register: wait_for_all_osds_up
@ -69,10 +77,11 @@
delay: "{{ delay_wait_osd_up }}" delay: "{{ delay_wait_osd_up }}"
changed_when: false changed_when: false
delegate_to: "{{ groups[mon_group_name][0] }}" delegate_to: "{{ groups[mon_group_name][0] }}"
run_once: true
until: until:
- (wait_for_all_osds_up.stdout | from_json)["osdmap"]["osdmap"]["num_osds"] | int > 0 - (wait_for_all_osds_up.stdout | from_json)["osdmap"]["osdmap"]["num_osds"] | int > 0
- (wait_for_all_osds_up.stdout | from_json)["osdmap"]["osdmap"]["num_osds"] == (wait_for_all_osds_up.stdout | from_json)["osdmap"]["osdmap"]["num_up_osds"] - (wait_for_all_osds_up.stdout | from_json)["osdmap"]["osdmap"]["num_osds"] == (wait_for_all_osds_up.stdout | from_json)["osdmap"]["osdmap"]["num_up_osds"]
when:
- inventory_hostname == ansible_play_hosts_all | last
- name: include crush_rules.yml - name: include crush_rules.yml
include_tasks: crush_rules.yml include_tasks: crush_rules.yml
@ -95,18 +104,11 @@
- not add_osd | bool - not add_osd | bool
- openstack_keys_tmp is defined - openstack_keys_tmp is defined
- name: unset noup flag
command: "{{ container_exec_cmd | default('') }} ceph --cluster {{ cluster }} osd unset noup"
delegate_to: "{{ groups[mon_group_name][0] }}"
changed_when: False
when:
- not rolling_update | default(False) | bool
- inventory_hostname == ansible_play_hosts_all | last
# Create the pools listed in openstack_pools # Create the pools listed in openstack_pools
- name: include openstack_config.yml - name: include openstack_config.yml
include_tasks: openstack_config.yml include_tasks: openstack_config.yml
when: when:
- not add_osd | bool - not add_osd | bool
- not rolling_update | default(False) | bool
- openstack_config | bool - openstack_config | bool
- inventory_hostname == groups[osd_group_name] | last - inventory_hostname == groups[osd_group_name] | last