From: Sébastien Han <seb@redhat.com>
Date: Mon, 20 Aug 2018 13:53:03 +0000 (+0200)
Subject: iscsi group name preserve backward compatibility
X-Git-Tag: v3.1.0rc19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4ef9d42e86710a6d9875dfa9b93de027da18e69c;p=ceph-ansible.git

iscsi group name preserve backward compatibility

Recently we renamed the group_name for iscsi iscsigws where previously
it was named iscsi-gws. Existing deployments with a host file section
with iscsi-gws must continue to work.

This commit adds the old group name as a backoward compatility, no error
from Ansible should be expected, if the hostgroup is not found nothing
is played.

Close: https://bugzilla.redhat.com/show_bug.cgi?id=1619167
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 77a3a682f358c8e9a40c5b50e980b5e9ec5f6d60)
---

diff --git a/infrastructure-playbooks/purge-iscsi-gateways.yml b/infrastructure-playbooks/purge-iscsi-gateways.yml
index fa86d126e..369901430 100644
--- a/infrastructure-playbooks/purge-iscsi-gateways.yml
+++ b/infrastructure-playbooks/purge-iscsi-gateways.yml
@@ -20,7 +20,9 @@
         igw_purge_type: "{{ purge_config }}"
 
 - name: Removing the gateway configuration
-  hosts: iscsigws
+  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 4ef8c3bcf..a33158bfc 100644
--- a/infrastructure-playbooks/rolling_update.yml
+++ b/infrastructure-playbooks/rolling_update.yml
@@ -681,6 +681,7 @@
 
   hosts:
     - "{{ iscsi_gw_group_name|default('iscsigws') }}"
+    - iscsi-gws # for backward compatibility only!
 
   serial: 1
   become: True
diff --git a/site-docker.yml.sample b/site-docker.yml.sample
index 6f6060735..3f1bbf4cb 100644
--- a/site-docker.yml.sample
+++ b/site-docker.yml.sample
@@ -12,6 +12,7 @@
   - rbdmirrors
   - clients
   - iscsigws
+  - iscsi-gws # for backward compatibility only!
   - mgrs
 
   gather_facts: false
@@ -116,7 +117,7 @@
             start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
   roles:
     - role: ceph-defaults
-      tags: ['ceph_update_config'] 
+      tags: ['ceph_update_config']
     - role: ceph-docker-common
     - role: ceph-config
       tags: ['ceph_update_config']
diff --git a/site.yml.sample b/site.yml.sample
index 9da493682..3cda98036 100644
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -13,6 +13,7 @@
   - clients
   - mgrs
   - iscsigws
+  - iscsi-gws # for backward compatibility only!
 
   gather_facts: false
 
@@ -347,7 +348,9 @@
             status: "Complete"
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
-- hosts: iscsigws
+- hosts:
+    - iscsigws
+    - iscsi-gws # for backward compatibility only!
   gather_facts: false
   become: True
   pre_tasks: