From 8b8fa74db7bccc25d7fa40bb09fa9230e147fcbc Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Tue, 16 Jun 2020 17:43:13 +0200 Subject: [PATCH] switch_to_containers: don't set noup flag 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 (cherry picked from commit b91d60d38456f9e316bee3daeb2f72dda0315cae) --- ...-from-non-containerized-to-containerized-ceph-daemons.yml | 1 + roles/ceph-osd/tasks/main.yml | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml index 25b64ae29..87821fc18 100644 --- a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml +++ b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml @@ -212,6 +212,7 @@ health_osd_check_delay: 15 containerized_deployment: true osd_group_name: osds + switch_to_containers: True hosts: - "{{ osd_group_name|default('osds') }}" diff --git a/roles/ceph-osd/tasks/main.yml b/roles/ceph-osd/tasks/main.yml index 961ae006f..e6645cf41 100644 --- a/roles/ceph-osd/tasks/main.yml +++ b/roles/ceph-osd/tasks/main.yml @@ -40,7 +40,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 ceph_disk_cli_options_facts.yml include_tasks: ceph_disk_cli_options_facts.yml @@ -102,6 +104,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