Merge pull request #1281 from ceph/purge-ceph-detect-init

purge: ability to purge client role

infrastructure-playbooks/purge-cluster.yml

@@ -40,6 +40,7 @@
     rgw_group_name:       rgws
     rbdmirror_group_name: rbd-mirrors
     nfs_group_name:       nfss
+    client_group_name:       clients
 
   hosts:
     - "{{ mon_group_name }}"
@@ -48,6 +49,7 @@
     - "{{ rgw_group_name }}"
     - "{{ rbdmirror_group_name }}"
     - "{{ nfs_group_name }}"
+    - "{{ client_group_name }}"
 
   become: true
 
@@ -435,6 +437,7 @@
     rgw_group_name:       rgws
     rbdmirror_group_name: rbd-mirrors
     nfs_group_name:       nfss
+    client_group_name:       clients
 
     # When set to true both groups of packages are purged.
     # This can cause problem with qemu-kvm
@@ -466,6 +469,7 @@
     - "{{ rgw_group_name }}"
     - "{{ rbdmirror_group_name }}"
     - "{{ nfs_group_name }}"
+    - "{{ client_group_name }}"
 
   gather_facts: false # Already gathered previously
 

infrastructure-playbooks/purge-docker-cluster.yml

@@ -86,6 +86,7 @@
       state: absent
       name: "{{ ceph_mds_docker_username }}/{{ ceph_mds_docker_imagename }}"
       tag: "{{ ceph_mds_docker_image_tag }}"
+      force: yes
     tags:
       remove_img
 
@@ -132,6 +133,7 @@
       state: absent
       name: "{{ ceph_rgw_docker_username }}/{{ ceph_rgw_docker_imagename }}"
       tag: "{{ ceph_rgw_docker_image_tag }}"
+      force: yes
     tags:
       remove_img
 
@@ -178,6 +180,7 @@
       state: absent
       name: "{{ ceph_rbd_mirror_docker_username }}/{{ ceph_rbd_mirror_docker_imagename }}"
       tag: "{{ ceph_rbd_mirror_docker_image_tag }}"
+      force: yes
     tags:
       remove_img
 
@@ -233,6 +236,7 @@
       state: absent
       name: "{{ ceph_nfs_docker_username }}/{{ ceph_nfs_docker_imagename }}"
       tag: "{{ ceph_nfs_docker_image_tag }}"
+      force: yes
     tags:
       remove_img
 
@@ -328,6 +332,7 @@
       state: absent
       name: "{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}"
       tag: "{{ ceph_osd_docker_image_tag }}"
+      force: yes
     tags:
       remove_img
 
@@ -385,6 +390,7 @@
       state: absent
       name: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}"
       tag: "{{ ceph_mon_docker_image_tag }}"
+      force: yes
     tags:
       remove_img