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

Revert "switch_to_containers: don't set noup flag" 

This reverts commit b7ec4a995b.

We need to provide a tag for RHCS 3.3z6 without this commit.
pull/5467/head
Guillaume Abrioux 2020-06-25 17:07:25 +02:00
parent a2556f084d
commit 693e534ee9
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
View File

@ -212,7 +212,6 @@
health_osd_check_delay: 15 health_osd_check_delay: 15
containerized_deployment: true containerized_deployment: true
osd_group_name: osds osd_group_name: osds
switch_to_containers: True
hosts: hosts:
- "{{ osd_group_name|default('osds') }}" - "{{ osd_group_name|default('osds') }}"

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

@ -40,9 +40,7 @@
delegate_to: "{{ groups[mon_group_name][0] }}" delegate_to: "{{ groups[mon_group_name][0] }}"
run_once: True run_once: True
changed_when: False changed_when: False
when: when: not rolling_update | default(False) | bool
- not rolling_update | default(False) | bool
- not switch_to_containers | default(False) | bool
- name: include ceph_disk_cli_options_facts.yml - name: include ceph_disk_cli_options_facts.yml
include_tasks: ceph_disk_cli_options_facts.yml include_tasks: ceph_disk_cli_options_facts.yml
@ -104,7 +102,6 @@
changed_when: False changed_when: False
when: when:
- not rolling_update | default(False) | bool - not rolling_update | default(False) | bool
- not switch_to_containers | default(False) | bool
- inventory_hostname == ansible_play_hosts_all | last - inventory_hostname == ansible_play_hosts_all | last
- name: wait for all osd to be up - name: wait for all osd to be up