Merge pull request #1063 from eduardegorov/egorove_purge-cluster_hardcoded_group_names

Fix hard-coded group names in include tasks for group variable file names

infrastructure-playbooks/purge-cluster.yml

@@ -39,7 +39,7 @@
     osd_group_name:       osds
     mds_group_name:       mdss
     rgw_group_name:       rgws
-    rbdmirror_group_name: rbdmirrors
+    rbdmirror_group_name: rbd-mirrors
     nfs_group_name:       nfss
 
   hosts:
@@ -75,7 +75,7 @@
   - include_vars: roles/ceph-mds/defaults/main.yml
   - include_vars: group_vars/all
     failed_when: false
-  - include_vars: group_vars/mdss
+  - include_vars: group_vars/{{ mds_group_name }}
     failed_when: false
 
   - name: stop ceph.target with systemd
@@ -126,7 +126,7 @@
   - include_vars: roles/ceph-rgw/defaults/main.yml
   - include_vars: group_vars/all
     failed_when: false
-  - include_vars: group_vars/rgws
+  - include_vars: group_vars/{{ rgw_group_name }}
     failed_when: false
 
   - name: stop ceph.target with systemd
@@ -163,7 +163,7 @@
 - name: purge ceph rbd-mirror cluster
 
   vars:
-    rbdmirror_group_name: rbdmirrors
+    rbdmirror_group_name: rbd-mirrors
 
   hosts:
     - "{{ rbdmirror_group_name }}"
@@ -177,7 +177,7 @@
   - include_vars: roles/ceph-rbd-mirror/defaults/main.yml
   - include_vars: group_vars/all
     failed_when: false
-  - include_vars: group_vars/rbd-mirrors
+  - include_vars: group_vars/{{ rbdmirror_group_name }}
     failed_when: false
 
   - name: stop ceph.target with systemd
@@ -199,7 +199,7 @@
 
 # Ubuntu 14.04
   - name: stop ceph rbd mirror on ubuntu
-    command: initctl stop ceph-rbd-mirorr cluster={{ cluster }} id=admin
+    command: initctl stop ceph-rbd-mirror cluster={{ cluster }} id=admin
     failed_when: false
     when:
       ansible_distribution == 'Ubuntu'
@@ -222,7 +222,7 @@
   - include_vars: roles/ceph-nfs/defaults/main.yml
   - include_vars: group_vars/all
     failed_when: false
-  - include_vars: group_vars/nfss
+  - include_vars: group_vars/{{ nfs_group_name }}
     failed_when: false
 
   - name: stop ceph.target with systemd
@@ -291,12 +291,12 @@
   - include_vars: roles/ceph-osd/defaults/main.yml
   - include_vars: group_vars/all
     failed_when: false
-  - include_vars: group_vars/osds
+  - include_vars: group_vars/{{ osd_group_name }}
     failed_when: false
 
   - name: check for a device list
     fail:
-      msg: "OSD automatic discovery was detected, purge cluster does not support this scenario. If you want to purge the cluster, manually provide the list of devices in group_vars/osds using the devices variable."
+      msg: "OSD automatic discovery was detected, purge cluster does not support this scenario. If you want to purge the cluster, manually provide the list of devices in group_vars/{{ osd_group_name }} using the devices variable."
     when:
       devices is not defined and
       osd_auto_discovery
@@ -429,7 +429,8 @@
 - name: purge ceph mon cluster
 
   vars:
-    mon_group_name: mons
+    mon_group_name:       mons
+    restapi_group_name:   restapis
 
   hosts:
     - "{{ mon_group_name }}"
@@ -444,9 +445,9 @@
   - include_vars: roles/ceph-restapi/defaults/main.yml
   - include_vars: group_vars/all
     failed_when: false
-  - include_vars: group_vars/mons
+  - include_vars: group_vars/{{ mon_group_name }}
     failed_when: false
-  - include_vars: group_vars/restapis
+  - include_vars: group_vars/{{ restapi_group_name }}
     failed_when: false
 
   - name: stop ceph.target with systemd
@@ -490,7 +491,7 @@
     osd_group_name:       osds
     mds_group_name:       mdss
     rgw_group_name:       rgws
-    rbdmirror_group_name: rbdmirrors
+    rbdmirror_group_name: rbd-mirrors
     nfs_group_name:       nfss
 
 # When set to true both groups of packages are purged.
@@ -611,7 +612,7 @@
     when:
       ansible_distribution == 'Ubuntu'
 
-  - name: remove Upstart nad SysV files
+  - name: remove Upstart and SysV files
     shell: "find /etc -name '*ceph*' -delete"
     when:
       ansible_distribution == 'Ubuntu'
@@ -652,6 +653,15 @@
 
 - name: purge fetch directory
 
+  vars:
+    mon_group_name:       mons
+    osd_group_name:       osds
+    mds_group_name:       mdss
+    rgw_group_name:       rgws
+    rbdmirror_group_name: rbdmirrors
+    nfs_group_name:       nfss
+    restapi_group_name:   restapis
+
   hosts:
     - localhost
 
@@ -661,19 +671,19 @@
   - include_vars: roles/ceph-common/defaults/main.yml
   - include_vars: group_vars/all
     failed_when: false
-  - include_vars: group_vars/mdss
+  - include_vars: group_vars/{{ mds_group_name }}
     failed_when: false
-  - include_vars: group_vars/rgws
+  - include_vars: group_vars/{{ rgw_group_name }}
     failed_when: false
-  - include_vars: group_vars/rbd-mirrors
+  - include_vars: group_vars/{{ rbdmirror_group_name }}
     failed_when: false
-  - include_vars: group_vars/nfss
+  - include_vars: group_vars/{{ nfs_group_name }}
     failed_when: false
-  - include_vars: group_vars/osds
+  - include_vars: group_vars/{{ osd_group_name }}
     failed_when: false
-  - include_vars: group_vars/mons
+  - include_vars: group_vars/{{ mon_group_name }}
     failed_when: false
-  - include_vars: group_vars/restapis
+  - include_vars: group_vars/{{ restapi_group_name }}
     failed_when: false
 
   - name: purge fetch directory for localhost

infrastructure-playbooks/purge-docker-cluster.yml

@@ -59,7 +59,7 @@
   - include_vars: roles/ceph-mds/defaults/main.yml
   - include_vars: group_vars/all
     failed_when: false
-  - include_vars: group_vars/mdss
+  - include_vars: group_vars/{{ mds_group_name }}
     failed_when: false
 
   - name: disable ceph mds service
@@ -105,7 +105,7 @@
   - include_vars: roles/ceph-rgw/defaults/main.yml
   - include_vars: group_vars/all
     failed_when: false
-  - include_vars: group_vars/rgws
+  - include_vars: group_vars/{{ rgw_group_name }}
     failed_when: false
 
   - name: disable ceph rgw service
@@ -139,7 +139,7 @@
 - name: purge ceph rbd-mirror cluster
 
   vars:
-    rbdmirror_group_name: rbd_mirrors
+    rbdmirror_group_name: rbd-mirrors
 
   hosts:
     - "{{ rbdmirror_group_name }}"
@@ -151,7 +151,7 @@
   - include_vars: roles/ceph-rbd-mirror/defaults/main.yml
   - include_vars: group_vars/all
     failed_when: false
-  - include_vars: group_vars/rbd-mirrors
+  - include_vars: group_vars/{{ rbdmirror_group_name }}
     failed_when: false
 
   - name: disable ceph rbd-mirror service
@@ -197,7 +197,7 @@
   - include_vars: roles/ceph-nfs/defaults/main.yml
   - include_vars: group_vars/all
     failed_when: false
-  - include_vars: group_vars/nfss
+  - include_vars: group_vars/{{ nfs_group_name }}
     failed_when: false
 
   - name: disable ceph nfs service
@@ -252,7 +252,7 @@
   - include_vars: roles/ceph-osd/defaults/main.yml
   - include_vars: group_vars/all
     failed_when: false
-  - include_vars: group_vars/osds
+  - include_vars: group_vars/{{ osd_group_name }}
     failed_when: false
 
   - name: disable ceph osd service
@@ -335,7 +335,8 @@
 - name: purge ceph mon cluster
 
   vars:
-    mon_group_name: mons
+    mon_group_name:       mons
+    restapi_group_name:   restapis
 
   hosts:
     - "{{ mon_group_name }}"
@@ -348,9 +349,9 @@
   - include_vars: roles/ceph-restapi/defaults/main.yml
   - include_vars: group_vars/all
     failed_when: false
-  - include_vars: group_vars/mons
+  - include_vars: group_vars/{{ mon_group_name }}
     failed_when: false
-  - include_vars: group_vars/restapis
+  - include_vars: group_vars/{{ restapi_group_name }}
     failed_when: false
 
   - name: disable ceph mon service
@@ -395,7 +396,7 @@
     osd_group_name:       osds
     mds_group_name:       mdss
     rgw_group_name:       rgws
-    rbdmirror_group_name: rbd_mirrors
+    rbdmirror_group_name: rbd-mirrors
     nfs_group_name:       nfss
 
   hosts:
@@ -565,7 +566,7 @@
     osd_group_name:       osds
     mds_group_name:       mdss
     rgw_group_name:       rgws
-    rbdmirror_group_name: rbd_mirrors
+    rbdmirror_group_name: rbd-mirrors
     nfs_group_name:       nfss
 
   hosts:
@@ -593,6 +594,15 @@
 
 - name: purge fetch directory
 
+  vars:
+    mon_group_name:       mons
+    osd_group_name:       osds
+    mds_group_name:       mdss
+    rgw_group_name:       rgws
+    rbdmirror_group_name: rbd-mirrors
+    nfs_group_name:       nfss
+    restapi_group_name:   restapis
+
   hosts:
     - localhost
 
@@ -602,19 +612,19 @@
   - include_vars: roles/ceph-common/defaults/main.yml
   - include_vars: group_vars/all
     failed_when: false
-  - include_vars: group_vars/mdss
+  - include_vars: group_vars/{{ mds_group_name }}
     failed_when: false
-  - include_vars: group_vars/rgws
+  - include_vars: group_vars/{{ rgw_group_name }}
     failed_when: false
-  - include_vars: group_vars/rbd-mirrors
+  - include_vars: group_vars/{{ rbdmirror_group_name }}
     failed_when: false
-  - include_vars: group_vars/nfss
+  - include_vars: group_vars/{{ nfs_group_name }}
     failed_when: false
-  - include_vars: group_vars/osds
+  - include_vars: group_vars/{{ osd_group_name }}
     failed_when: false
-  - include_vars: group_vars/mons
+  - include_vars: group_vars/{{ mon_group_name }}
     failed_when: false
-  - include_vars: group_vars/restapis
+  - include_vars: group_vars/{{ restapi_group_name }}
     failed_when: false
 
   - name: purge fetch directory for localhost

infrastructure-playbooks/rolling_update.yml

@@ -63,7 +63,8 @@
 - name: upgrade ceph mon cluster
 
   vars:
-    mon_group_name: mons
+    mon_group_name:       mons    
+    restapi_group_name:   restapis
     health_mon_check_retries: 5
     health_mon_check_delay: 10
 
@@ -83,9 +84,9 @@
     - include_vars: roles/ceph-restapi/defaults/main.yml
     - include_vars: group_vars/all
       failed_when: false
-    - include_vars: group_vars/mons
+    - include_vars: group_vars/{{ mon_group_name }}
       failed_when: false
-    - include_vars: group_vars/restapis
+    - include_vars: group_vars/{{ restapi_group_name }}
       failed_when: false
 
     - name: restart ceph mons with upstart
@@ -141,7 +142,7 @@
     - include_vars: roles/ceph-osd/defaults/main.yml
     - include_vars: group_vars/all
       failed_when: false
-    - include_vars: group_vars/osds
+    - include_vars: group_vars/{{ osd_group_name }}
       failed_when: false
 
     - name: set osd flags
@@ -161,7 +162,7 @@
     - include_vars: roles/ceph-osd/defaults/main.yml
     - include_vars: group_vars/all
       failed_when: false
-    - include_vars: group_vars/osds
+    - include_vars: group_vars/{{ osd_group_name }}
       failed_when: false
 
     - name: get osd numbers
@@ -227,7 +228,7 @@
     - include_vars: roles/ceph-mds/defaults/main.yml
     - include_vars: group_vars/all
       failed_when: false
-    - include_vars: group_vars/mdss
+    - include_vars: group_vars/{{ mds_group_name }}
       failed_when: false
 
     - name: restart ceph mdss with upstart
@@ -272,7 +273,7 @@
     - include_vars: roles/ceph-rgw/defaults/main.yml
     - include_vars: group_vars/all
       failed_when: false
-    - include_vars: group_vars/rgws
+    - include_vars: group_vars/{{ rgw_group_name }}
       failed_when: false
 
     - name: restart ceph rgws with systemd

infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml

@@ -33,7 +33,7 @@
     osd_group_name:       osds
     mds_group_name:       mdss
     rgw_group_name:       rgws
-    rbdmirror_group_name: rbd_mirrors
+    rbdmirror_group_name: rbd-mirrors
     nfs_group_name:       nfss
 
   hosts:
@@ -48,7 +48,7 @@
 
   tasks:
 
-  - name: install docker and dependancies for the docker module
+  - name: install docker and dependencies for the docker module
     package:
       name: "{{ item }}"
       state: present
@@ -93,7 +93,8 @@
 - name: switching from non-containerized to containerized ceph mon
 
   vars:
-    mon_group_name: mons
+    mon_group_name:       mons    
+    restapi_group_name:   restapis
 
   hosts:
     - "{{ mon_group_name }}"
@@ -107,9 +108,9 @@
   - include_vars: roles/ceph-restapi/defaults/main.yml
   - include_vars: group_vars/all
     failed_when: false
-  - include_vars: group_vars/mons
+  - include_vars: group_vars/{{ mon_group_name }}
     failed_when: false
-  - include_vars: group_vars/restapis
+  - include_vars: group_vars/{{ restapi_group_name }}
     failed_when: false
 
   - name: select a running monitor
@@ -130,7 +131,7 @@
       enabled: no
 
   # NOTE(leseb): should we also create systemd files
-  # intead of running raw docker commands?
+  # instead of running raw docker commands?
   # It is probably more elegant but will require a template file...
   # which would make this single file playbook more complex
 
@@ -196,7 +197,7 @@
   - include_vars: roles/ceph-osd/defaults/main.yml
   - include_vars: group_vars/all
     failed_when: false
-  - include_vars: group_vars/osds
+  - include_vars: group_vars/{{ osd_group_name }}
     failed_when: false
 
   - name: collect osd ids
@@ -301,7 +302,7 @@
   - include_vars: roles/ceph-mds/defaults/main.yml
   - include_vars: group_vars/all
     failed_when: false
-  - include_vars: group_vars/mdss
+  - include_vars: group_vars/{{ mds_group_name }}
     failed_when: false
 
   - name: stop ceph mds service
@@ -361,7 +362,7 @@
   - include_vars: roles/ceph-rgw/defaults/main.yml
   - include_vars: group_vars/all
     failed_when: false
-  - include_vars: group_vars/rgws
+  - include_vars: group_vars/{{ rgw_group_name }}
     failed_when: false
 
   - name: stop ceph rgw service
@@ -409,7 +410,7 @@
 - name: switching from non-containerized to containerized ceph rbd-mirror
 
   vars:
-    rbdmirror_group_name: rbd_mirrors
+    rbdmirror_group_name: rbd-mirrors
 
   hosts:
     - "{{ rbdmirror_group_name }}"
@@ -422,7 +423,7 @@
   - include_vars: roles/ceph-rbd-mirror/defaults/main.yml
   - include_vars: group_vars/all
     failed_when: false
-  - include_vars: group_vars/rbd-mirrors
+  - include_vars: group_vars/{{ rbdmirror_group_name }}
     failed_when: false
 
   - name: stop ceph rbd mirror service
@@ -481,7 +482,7 @@
   - include_vars: roles/ceph-nfs/defaults/main.yml
   - include_vars: group_vars/all
     failed_when: false
-  - include_vars: group_vars/nfss
+  - include_vars: group_vars/{{ nfs_group_name }}
     failed_when: false
 
   - name: stop ceph nfs service