From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Thu, 21 Mar 2019 08:00:02 +0000 (+0100)
Subject: update: remove rbdmirror legacy task
X-Git-Tag: v4.0.0rc1~13
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=45ba90c169c40e8d6b9865bc368f25206162c779;p=ceph-ansible.git

update: remove rbdmirror legacy task

This task is no longer needed for next release.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---

diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml
index dc557b716..44199559e 100644
--- a/infrastructure-playbooks/rolling_update.yml
+++ b/infrastructure-playbooks/rolling_update.yml
@@ -608,22 +608,12 @@
   serial: 1
   become: True
   tasks:
-    # NOTE(leseb): these tasks have a 'failed_when: false'
-    # in case we run before luminous or after
-    - name: stop ceph rbd mirror before luminous
-      systemd:
-        name: "ceph-rbd-mirror@{{ ceph_rbd_mirror_local_user }}"
-        state: stopped
-        enabled: no
-      failed_when: false
-
-    - name: stop ceph rbd mirror for and after luminous
+    - name: stop ceph rbd mirror
       systemd:
         name: "ceph-rbd-mirror@rbd-mirror.{{ ansible_hostname }}"
         state: stopped
         enabled: no
         masked: yes
-      failed_when: false
 
     - import_role:
         name: ceph-defaults