From 693e534ee952fe24d86bfb5b46e7f84e1a94981a Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Thu, 25 Jun 2020 17:07:25 +0200 Subject: [PATCH] Revert "switch_to_containers: don't set noup flag" This reverts commit b7ec4a995b9df0fb673160864887b973012b39bc. We need to provide a tag for RHCS 3.3z6 without this commit. --- ...-from-non-containerized-to-containerized-ceph-daemons.yml | 1 - roles/ceph-osd/tasks/main.yml | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) 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 87821fc18..25b64ae29 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,7 +212,6 @@ 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 e6645cf41..961ae006f 100644 --- a/roles/ceph-osd/tasks/main.yml +++ b/roles/ceph-osd/tasks/main.yml @@ -40,9 +40,7 @@ delegate_to: "{{ groups[mon_group_name][0] }}" run_once: True changed_when: False - when: - - not rolling_update | default(False) | bool - - not switch_to_containers | default(False) | bool + when: not rolling_update | default(False) | bool - name: include ceph_disk_cli_options_facts.yml include_tasks: ceph_disk_cli_options_facts.yml @@ -104,7 +102,6 @@ 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