]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
purge: remove zap_block_devs variable
authorSébastien Han <seb@redhat.com>
Wed, 18 Jan 2017 09:55:01 +0000 (10:55 +0100)
committerSébastien Han <seb@redhat.com>
Wed, 18 Jan 2017 09:55:01 +0000 (10:55 +0100)
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>
infrastructure-playbooks/purge-cluster.yml

index 69e9fbcc27dd7b789e2c0d68a025a7b45a8f7a08..fd243b5d38cd840b3627db70c57289241b27996f 100644 (file)
   vars:
     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:
     - "{{ osd_group_name }}"
 
     when:
       - ceph_disk_present.rc == 0
       - ceph_data_partlabels.rc == 0
-      - zap_block_devs
 
   - name: get ceph journal partitions
     shell: |
     with_items: "{{ ceph_journal_partition_to_erase_path.stdout_lines }}"
     when:
       - ceph_journal_partlabels.rc == 0
-      - zap_block_devs
+      - raw_multi_journal
 
 
 - name: purge ceph mon cluster