purge: remove zap_block_devs variable

The name of this variable was a bit confusing since its activation will
zap all the block devices no matter which osd scenario we are using.
Removing this variable and applying a condition on the OSD scenario is
now feasible and easier since we import group_vars variable files for
OSDs.

Signed-off-by: Sébastien Han <seb@redhat.com>
pull/1235/head
Sébastien Han 2017-01-18 10:55:01 +01:00
parent b7fcbe5ca2
commit adeb3decf3
1 changed files with 1 additions and 5 deletions

View File

@ -253,9 +253,6 @@
vars: vars:
osd_group_name: osds osd_group_name: osds
# When set to true and raw _multi_journal is used then block devices are also zapped
zap_block_devs: true
hosts: hosts:
- "{{ osd_group_name }}" - "{{ osd_group_name }}"
@ -385,7 +382,6 @@
when: when:
- ceph_disk_present.rc == 0 - ceph_disk_present.rc == 0
- ceph_data_partlabels.rc == 0 - ceph_data_partlabels.rc == 0
- zap_block_devs
- name: get ceph journal partitions - name: get ceph journal partitions
shell: | shell: |
@ -409,7 +405,7 @@
with_items: "{{ ceph_journal_partition_to_erase_path.stdout_lines }}" with_items: "{{ ceph_journal_partition_to_erase_path.stdout_lines }}"
when: when:
- ceph_journal_partlabels.rc == 0 - ceph_journal_partlabels.rc == 0
- zap_block_devs - raw_multi_journal
- name: purge ceph mon cluster - name: purge ceph mon cluster