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.

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 87821fc18ecdeafc8d7cf6d751886b90b0eaac27..25b64ae291aa64896deb42b764005c2cdcee9f1a 100644 (file)
--- 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 e6645cf415fc97bdc2e739a47715821727909a9f..961ae006f5aa8dab95c6ed62699e26f302a02562 100644 (file)
--- 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