From a002508a915c310a9a0b7afd0b26c3410acf2471 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Tue, 7 Feb 2017 21:55:36 +0100 Subject: [PATCH] purge-docker: also purge journal devices MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sébastien Han --- .../purge-docker-cluster.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/infrastructure-playbooks/purge-docker-cluster.yml b/infrastructure-playbooks/purge-docker-cluster.yml index ec53beeff..5d601b42c 100644 --- a/infrastructure-playbooks/purge-docker-cluster.yml +++ b/infrastructure-playbooks/purge-docker-cluster.yml @@ -293,14 +293,18 @@ 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 }}" + 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 }}" + with_items: + - "{{ ceph_osd_docker_devices }}" + - "{{ raw_journal_devices }}" # zap twice - name: zap ceph osd disk @@ -313,14 +317,18 @@ 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 }}" + 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 }}" + with_items: + - "{{ ceph_osd_docker_devices }}" + - "{{ raw_journal_devices }}" - name: remove ceph osd service file: