From: Dimitri Savineau <dsavinea@redhat.com>
Date: Mon, 9 Nov 2020 22:02:17 +0000 (-0500)
Subject: rolling_update: always run cv simple scan/activate
X-Git-Tag: v6.0.0alpha3~62
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3e4925837739c2d01675746c1b71ce7d8d1da299;p=ceph-ansible.git

rolling_update: always run cv simple scan/activate

There's no need to use a condition on the ceph release for the
ceph-volume simple commands.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
---

diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml
index 021d67477..e18cc9ea4 100644
--- a/infrastructure-playbooks/rolling_update.yml
+++ b/infrastructure-playbooks/rolling_update.yml
@@ -403,17 +403,13 @@
       command: "ceph-volume --cluster={{ cluster }} simple scan --force"
       environment:
         CEPH_VOLUME_DEBUG: "{{ ceph_volume_debug }}"
-      when:
-        - ceph_release in ["nautilus", "octopus"]
-        - not containerized_deployment | bool
+      when: not containerized_deployment | bool
 
     - name: activate scanned ceph-disk osds and migrate to ceph-volume if deploying nautilus
       command: "ceph-volume --cluster={{ cluster }} simple activate --all"
       environment:
         CEPH_VOLUME_DEBUG: "{{ ceph_volume_debug }}"
-      when:
-        - ceph_release in ["nautilus", "octopus"]
-        - not containerized_deployment | bool
+      when: not containerized_deployment | bool
 
     - name: get num_pgs - non container
       command: "{{ container_exec_cmd_update_osd|default('') }} ceph --cluster {{ cluster }} pg stat --format json"