Reuse code from remove* plugins in purge cluster

Change-Id: I59a7f2ac8d300bf42210394be2d6a5d7b6d0a11f
Mirantis · Apr 17, 2017 · 8ce32b5 · 8ce32b5
1 parent 8cfb9c6
commit 8ce32b5
Showing 1 changed file with 6 additions and 27 deletions.
diff --git a/plugins/playbook/purge_cluster/decapod_plugin_playbook_purge_cluster/playbook.yaml b/plugins/playbook/purge_cluster/decapod_plugin_playbook_purge_cluster/playbook.yaml
@@ -26,54 +26,33 @@
         state: stopped
       when: ansible_service_mgr == "systemd" and "mons" not in group_names
 
-
 - name: Stop MDSes
   hosts: mdss
   become: true
-  gather_facts: false
   tasks:
     - name: Stop MDS if systemd
       service:
         name: "ceph-mds@{{ ansible_hostname }}"
         state: stopped
         enabled: no
 
-
 - name: Stop RGWs
   hosts: rgws
   become: true
-  gather_facts: false
   tasks:
-    - name: Stop RGW if systemd
-      service:
-        name: "ceph-radosgw@rgw.{{ ansible_hostname }}"
-        state: stopped
-        enabled: no
-
+  - include: "{{ decapod_common_playbooks }}/tasks/clean_rgw_host.yaml"
 
 - name: Stop RBD Mirrors
   hosts: rbdmirrors
   become: true
-  gather_facts: false
   tasks:
-    - name: Stop RGW if systemd
-      service:
-        name: "ceph-rbd-mirror@admin.service"
-        state: stopped
-        enabled: no
-
+  - include: "{{ decapod_common_playbooks }}/tasks/clean_rbdmirror_host.yaml"
 
-- name: Stop RBD Mirrors
+- name: Stop NFS gateways
   hosts: nfss
   become: true
-  gather_facts: false
   tasks:
-    - name: Stop NFS Ganesha if systemd
-      service:
-        name: nfs-ganesha
-        state: stopped
-        enabled: no
-
+  - include: "{{ decapod_common_playbooks }}/tasks/clean_nfs_host.yaml"
 
 - name: Clear REST APIs
   hosts: restapis
@@ -82,7 +61,6 @@
   tasks:
   - include: "{{ decapod_common_playbooks }}/tasks/clean_restapi_host.yaml"
 
-
 - name: Clear OSDs
   hosts: osds
   become: true
@@ -106,7 +84,6 @@
 - name: Remove ceph data
   become: true
   hosts: all
-  gather_facts: false
   vars:
     ceph_packages:
       - ceph
@@ -116,6 +93,8 @@
       - ceph-mds
       - ceph-release
       - ceph-radosgw
+      - radosgw
+      - rbd-mirror
     ceph_remaining_packages:
       - libcephfs1
       - librados2