purge-docker: also purge journal devices

Signed-off-by: Sébastien Han <seb@redhat.com>
pull/1287/head
Sébastien Han 2017-02-07 21:55:36 +01:00
parent dd548c6034
commit a002508a91
1 changed files with 12 additions and 4 deletions

View File

@ -293,14 +293,18 @@
privileged: yes privileged: yes
env: "CEPH_DAEMON=zap_device,OSD_DEVICE={{ item }}" env: "CEPH_DAEMON=zap_device,OSD_DEVICE={{ item }}"
volumes: "/var/lib/ceph:/var/lib/ceph,/etc/ceph:/etc/ceph,/dev:/dev,/run:/run" 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 - name: remove ceph osd zap disk container
docker: docker:
image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}" image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
name: "{{ ansible_hostname }}-osd-zap-{{ item | regex_replace('/', '') }}" name: "{{ ansible_hostname }}-osd-zap-{{ item | regex_replace('/', '') }}"
state: absent state: absent
with_items: "{{ ceph_osd_docker_devices }}" with_items:
- "{{ ceph_osd_docker_devices }}"
- "{{ raw_journal_devices }}"
# zap twice # zap twice
- name: zap ceph osd disk - name: zap ceph osd disk
@ -313,14 +317,18 @@
privileged: yes privileged: yes
env: "CEPH_DAEMON=zap_device,OSD_DEVICE={{ item }}" env: "CEPH_DAEMON=zap_device,OSD_DEVICE={{ item }}"
volumes: "/var/lib/ceph:/var/lib/ceph,/etc/ceph:/etc/ceph,/dev:/dev,/run:/run" 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 - name: remove ceph osd zap disk container
docker: docker:
image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}" image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
name: "{{ ansible_hostname }}-osd-zap-{{ item | regex_replace('/', '') }}" name: "{{ ansible_hostname }}-osd-zap-{{ item | regex_replace('/', '') }}"
state: absent state: absent
with_items: "{{ ceph_osd_docker_devices }}" with_items:
- "{{ ceph_osd_docker_devices }}"
- "{{ raw_journal_devices }}"
- name: remove ceph osd service - name: remove ceph osd service
file: file: