purge-docker: re-implement zap devices

We now run the container and waits until it dies. Prior to this we were
stopping it before completion so not all the devices where zapped.

Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/infrastructure-playbooks/purge-docker-cluster.yml b/infrastructure-playbooks/purge-docker-cluster.yml
index 5d601b42c40051e1f30247fc08ac302863e2af47..66cb1d7680a850f624a6c5de15d50f6d0a9b5f69 100644 (file)
--- a/infrastructure-playbooks/purge-docker-cluster.yml
+++ b/infrastructure-playbooks/purge-docker-cluster.yml
@@ -283,43 +283,27 @@
     with_items: "{{ ceph_osd_docker_devices }}"
     ignore_errors: true
 
-  - name: zap ceph osd disk
-    docker:
-      image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
-      name: "{{ ansible_hostname }}-osd-zap-{{ item | regex_replace('/', '') }}"
-      net: host
-      pid: host
-      state: started
-      privileged: yes
-      env: "CEPH_DAEMON=zap_device,OSD_DEVICE={{ item }}"
-      volumes: "/var/lib/ceph:/var/lib/ceph,/etc/ceph:/etc/ceph,/dev:/dev,/run:/run"
+  - name: zap ceph osd disks
+    shell: |
+      docker run \
+      --privileged=true \
+      --name {{ ansible_hostname }}-osd-zap-{{ item | regex_replace('/', '') }} \
+      -v /dev/:/dev/ \
+      -e OSD_DEVICE={{ item }} \
+      {{ ceph_docker_image }}:{{ ceph_docker_image_tag }} \
+      zap_device
     with_items:
       - "{{ ceph_osd_docker_devices }}"
       - "{{ raw_journal_devices }}"
 
-  - name: remove ceph osd zap disk container
-    docker:
-      image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
-      name: "{{ ansible_hostname }}-osd-zap-{{ item | regex_replace('/', '') }}"
-      state: absent
-    with_items:
-      - "{{ ceph_osd_docker_devices }}"
-      - "{{ raw_journal_devices }}"
-
-  # zap twice
-  - name: zap ceph osd disk
-    docker:
-      image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
-      name: "{{ ansible_hostname }}-osd-zap-{{ item | regex_replace('/', '') }}"
-      net: host
-      pid: host
-      state: started
-      privileged: yes
-      env: "CEPH_DAEMON=zap_device,OSD_DEVICE={{ item }}"
-      volumes: "/var/lib/ceph:/var/lib/ceph,/etc/ceph:/etc/ceph,/dev:/dev,/run:/run"
-    with_items:
-      - "{{ ceph_osd_docker_devices }}"
-      - "{{ raw_journal_devices }}"
+  - name: wait until the zap containers die
+    shell: |
+      docker ps | grep -sq {{ ansible_hostname }}-osd-zap
+    register: zap_alive
+    failed_when: false
+    until: zap_alive.rc != 0
+    retries: 5
+    delay: 10
 
   - name: remove ceph osd zap disk container
     docker: