Skip to content

Commit

Permalink
switch_to_containers: don't set noup flag
Browse files Browse the repository at this point in the history
We shouldn't set this flag when running switch_to_containers playbook.
Otherwise the playbook fails waiting for pgs to be clean.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1843569

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit b91d60d)
  • Loading branch information
guits authored and dsavineau committed Jun 17, 2020
1 parent 6ba9c37 commit c847c2f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@
vars:
containerized_deployment: true
osd_group_name: osds
switch_to_containers: True

hosts: "{{ osd_group_name|default('osds') }}"

Expand Down
5 changes: 4 additions & 1 deletion roles/ceph-osd/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@
delegate_to: "{{ groups[mon_group_name][0] }}"
run_once: True
changed_when: False
when: not rolling_update | default(False) | bool
when:
- not rolling_update | default(False) | bool
- not switch_to_containers | default(False) | bool

- name: include container_options_facts.yml
include_tasks: container_options_facts.yml
Expand All @@ -70,6 +72,7 @@
changed_when: False
when:
- not rolling_update | default(False) | bool
- not switch_to_containers | default(False) | bool
- inventory_hostname == ansible_play_hosts_all | last

- name: wait for all osd to be up
Expand Down

0 comments on commit c847c2f

Please sign in to comment.