From 72cd9199acb3db3c9f193dc14434bc41a5d5f8e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Mon, 6 Feb 2017 14:58:10 +0100 Subject: [PATCH 1/2] purge: ability to purge client role MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sébastien Han --- infrastructure-playbooks/purge-cluster.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml index 6831a7eda..e63cf3ab2 100644 --- a/infrastructure-playbooks/purge-cluster.yml +++ b/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 From c34d0a9d28e3a08cfa85fafcb9e3bff66e2a20bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Mon, 6 Feb 2017 14:58:39 +0100 Subject: [PATCH 2/2] purge-docker: force image deletion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit even if non-runnin containers are using this image as a reference. Signed-off-by: Sébastien Han --- infrastructure-playbooks/purge-docker-cluster.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/infrastructure-playbooks/purge-docker-cluster.yml b/infrastructure-playbooks/purge-docker-cluster.yml index 9ad1c35ef..5c7dd4fca 100644 --- a/infrastructure-playbooks/purge-docker-cluster.yml +++ b/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