From: Andrew Schoen <aschoen@redhat.com>
Date: Thu, 22 Dec 2016 19:47:22 +0000 (-0600)
Subject: purge-cluster: get journal partitions after zapping osd disks
X-Git-Tag: v2.2.0rc1~73^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=321cea8ba96cbca19b58aa9bbb76a584c268e2b1;p=ceph-ansible.git

purge-cluster: get journal partitions after zapping osd disks

In my testing zapping the osd disks deleted the journal
partitions, making the 'zap ceph journal partitions' task fail because
the partitions it found previously do not exist anymore.

This moves the task that finds the journal partitions after 'zap osd disks'
to catch any partitions ceph-disk might have missed.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---

diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml
index 9afc1befb..84a8c83cd 100644
--- a/infrastructure-playbooks/purge-cluster.yml
+++ b/infrastructure-playbooks/purge-cluster.yml
@@ -357,14 +357,6 @@
     failed_when: false
     register: ceph_journal_partlabels
 
-  - name: get ceph journal partitions
-    shell: |
-      blkid | awk '/ceph journal/ { sub (":", "", $1); print $1 }'
-    when:
-      - ceph_journal_partlabels.rc == 0
-    failed_when: false
-    register: ceph_journal_partition_to_erase_path
-
   - name: get osd data mount points
     shell: "(grep /var/lib/ceph/osd /proc/mounts || echo -n) | awk '{ print $2 }'"
     register: mounted_osd
@@ -408,6 +400,14 @@
      ceph_data_partlabels.rc == 0 and
      zap_block_devs
 
+  - name: get ceph journal partitions
+    shell: |
+      blkid | awk '/ceph journal/ { sub (":", "", $1); print $1 }'
+    when:
+      - ceph_journal_partlabels.rc == 0
+    failed_when: false
+    register: ceph_journal_partition_to_erase_path
+
   - name: zap ceph journal partitions
     shell: |
       # if the disk passed is a raw device AND the boot system disk