From 0441812959c3283b2db9795eeddbaa022b35aff7 Mon Sep 17 00:00:00 2001
From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Tue, 26 Nov 2019 14:43:07 +0100
Subject: [PATCH] purge/update: remove backward compatibility legacy

This was introduced in 3.1 and marked as deprecation
We can definitely drop it in stable-4.0

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---
 infrastructure-playbooks/purge-cluster.yml      |  1 -
 .../purge-docker-cluster.yml                    | 17 ++---------------
 .../purge-iscsi-gateways.yml                    |  2 --
 infrastructure-playbooks/rolling_update.yml     |  1 -
 4 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml
index c5333ed86..bd54034f5 100644
--- a/infrastructure-playbooks/purge-cluster.yml
+++ b/infrastructure-playbooks/purge-cluster.yml
@@ -129,7 +129,6 @@
     - grafana-server
     - clients
     - iscsigws
-    - iscsi-gws # for backward compatibility only!
 
   become: true
 
diff --git a/infrastructure-playbooks/purge-docker-cluster.yml b/infrastructure-playbooks/purge-docker-cluster.yml
index 4b0406ea2..f9f41a570 100644
--- a/infrastructure-playbooks/purge-docker-cluster.yml
+++ b/infrastructure-playbooks/purge-docker-cluster.yml
@@ -263,15 +263,7 @@
 
   tasks:
 
-# For backward compatibility
-  - name: disable ceph rgw service (old unit name, for backward compatibility)
-    service:
-      name: "ceph-rgw@{{ ansible_hostname }}"
-      state: stopped
-      enabled: no
-    ignore_errors: true
-
-  - name: disable ceph rgw service (new unit name)
+  - name: disable ceph rgw service
     service:
       name: "ceph-radosgw@*"
       state: stopped
@@ -287,12 +279,8 @@
 
   - name: remove ceph rgw service
     file:
-      path: "{{ item }}"
+      path: /etc/systemd/system/ceph-radosgw@.service
       state: absent
-    with_items:
-# For backward compatibility
-      - /etc/systemd/system/ceph-rgw@.service
-      - /etc/systemd/system/ceph-radosgw@.service
 
   - name: remove ceph rgw image
     docker_image:
@@ -514,7 +502,6 @@
     - "{{ mgr_group_name|default('mgrs') }}"
     - grafana-server
     - iscsigws
-    - iscsi-gws # for backward compatibility only!
     - clients
 
   gather_facts: false
diff --git a/infrastructure-playbooks/purge-iscsi-gateways.yml b/infrastructure-playbooks/purge-iscsi-gateways.yml
index 4f4ce04cd..154736041 100644
--- a/infrastructure-playbooks/purge-iscsi-gateways.yml
+++ b/infrastructure-playbooks/purge-iscsi-gateways.yml
@@ -22,7 +22,6 @@
 - name: stopping the gateways
   hosts:
     - iscsigws
-    - iscsi-gws # for backward compatibility only!
   become: yes
   vars:
     - igw_purge_type: "{{hostvars['localhost']['igw_purge_type']}}"
@@ -41,7 +40,6 @@
 - name: removing the gateway configuration
   hosts:
     - iscsigws
-    - iscsi-gws # for backward compatibility only!
   become: yes
   vars:
     - igw_purge_type: "{{ hostvars['localhost']['igw_purge_type'] }}"
diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml
index 7930aa3ce..645c04052 100644
--- a/infrastructure-playbooks/rolling_update.yml
+++ b/infrastructure-playbooks/rolling_update.yml
@@ -847,7 +847,6 @@
     upgrade_ceph_packages: True
   hosts:
     - "{{ iscsi_gw_group_name|default('iscsigws') }}"
-    - iscsi-gws # for backward compatibility only!
   serial: 1
   become: True
   tasks:
-- 
2.39.5