From 1e23d853f98c5cccb621854a1eceac12b44a2818 Mon Sep 17 00:00:00 2001
From: Dimitri Savineau <dsavinea@redhat.com>
Date: Mon, 13 May 2019 17:03:55 -0400
Subject: [PATCH] purge-docker-cluster: remove docker data

We never clean the content of /var/lib/docker so we can still have
some data present in this directory after run the purge playbook.
Pip isn't used anymore.
Also update the docker package name (especially the python binding
one).

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 168d7cd016a9aa3f771df0e805b5a35f137a9e41)
---
 .../purge-docker-cluster.yml                  | 34 ++++---------------
 1 file changed, 7 insertions(+), 27 deletions(-)

diff --git a/infrastructure-playbooks/purge-docker-cluster.yml b/infrastructure-playbooks/purge-docker-cluster.yml
index e198f28c3..702785245 100644
--- a/infrastructure-playbooks/purge-docker-cluster.yml
+++ b/infrastructure-playbooks/purge-docker-cluster.yml
@@ -512,33 +512,13 @@
     when: not is_atomic
     ignore_errors: true
 
-  - name: debian based systems tasks
-    block:
-      - name: remove docker-py on debian
-        pip:
-          name: docker-py
-          state: absent
-
-      - name: remove six on debian
-        pip:
-          name: six
-          state: absent
-
-      - name: remove pip and docker on debian
-        apt:
-          name: ['python-pip', 'docker-engine']
-          state: absent
-          update_cache: yes
-          autoremove: yes
-    when: ansible_distribution == 'Debian'
-
-  - name: remove pip and docker on ubuntu
+  - name: remove docker on debian/ubuntu
     apt:
-      name: ['python-pip', 'docker', 'docker.io']
+      name: ['docker-ce', 'docker-engine', 'docker.io', 'python-docker', 'python3-docker']
       state: absent
       update_cache: yes
       autoremove: yes
-    when: ansible_distribution == 'Ubuntu'
+    when: ansible_os_family == 'Debian'
 
   - name: red hat based systems tasks
     block:
@@ -546,7 +526,7 @@
         block:
           - name: remove packages on redhat
             yum:
-              name: ['epel-release', 'python-pip', 'docker-engine', 'docker']
+              name: ['epel-release', 'docker', 'python-docker-py']
               state: absent
 
           - name: remove package dependencies on redhat
@@ -563,9 +543,9 @@
 
       - name: dnf related tasks on red hat
         block:
-          - name: remove pip and docker on redhat
+          - name: remove docker on redhat
             dnf:
-              name: ['python-pip', 'docker-engine', 'docker']
+              name: ['docker', 'python3-docker']
               state: absent
 
           - name: remove package dependencies on redhat
@@ -608,7 +588,7 @@
       - /var/log/ceph
 
   - name: remove data
-    shell: rm -rf /var/lib/ceph/*
+    shell: rm -rf /var/lib/ceph/* /var/lib/docker/*
 
 - name: purge fetch directory