From adeb3decf38bddb2972e597f22a27bf9638fb41e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Wed, 18 Jan 2017 10:55:01 +0100 Subject: [PATCH] purge: remove zap_block_devs variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- infrastructure-playbooks/purge-cluster.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml index 69e9fbcc2..fd243b5d3 100644 --- a/infrastructure-playbooks/purge-cluster.yml +++ b/infrastructure-playbooks/purge-cluster.yml @@ -253,9 +253,6 @@ 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 }}" @@ -385,7 +382,6 @@ when: - ceph_disk_present.rc == 0 - ceph_data_partlabels.rc == 0 - - zap_block_devs - name: get ceph journal partitions shell: | @@ -409,7 +405,7 @@ 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