From 58eb045d2fac02337ed47ead1cab9b4cc484a092 Mon Sep 17 00:00:00 2001
From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Wed, 17 Jan 2018 09:06:43 +0100
Subject: [PATCH] purge-container: remove awk usage in favor of blkid

Avoid using `awk` to get the different devices from the partlabel.
Using `blkid` is more readable.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---
 .../purge-docker-cluster.yml                  | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/infrastructure-playbooks/purge-docker-cluster.yml b/infrastructure-playbooks/purge-docker-cluster.yml
index a2443b024..0414ede84 100644
--- a/infrastructure-playbooks/purge-docker-cluster.yml
+++ b/infrastructure-playbooks/purge-docker-cluster.yml
@@ -340,43 +340,43 @@
     ignore_errors: true
 
   - name: get ceph data partitions
-    shell: |
-      blkid | awk -F: '/ceph data/ { print $1 }'
+    command: |
+      blkid -o device -t PARTLABEL="ceph data"
     when: ceph_data_partlabels.rc == 0
     failed_when: false
     register: ceph_data_partition_to_erase_path
 
   - name: get ceph lockbox partitions
-    shell: |
-      blkid | awk '/ceph lockbox/ { sub (":", "", $1); print $1 }'
+    command: |
+      blkid -o device -t PARTLABEL="ceph lockbox"
     when: ceph_lockbox_partlabels.rc == 0
     failed_when: false
     register: ceph_lockbox_partition_to_erase_path
 
   - name: get ceph block partitions
-    shell: |
-      blkid | awk '/ceph block"/ { sub (":", "", $1); print $1 }'
+    command: |
+      blkid -o device -t PARTLABEL="ceph block"
     when: ceph_block_partlabels.rc == 0
     failed_when: false
     register: ceph_block_partition_to_erase_path
 
   - name: get ceph journal partitions
-    shell: |
-      blkid | awk '/ceph journal/ { sub (":", "", $1); print $1 }'
+    command: |
+      blkid -o device -t PARTLABEL="ceph journal"
     when: ceph_journal_partlabels.rc == 0
     failed_when: false
     register: ceph_journal_partition_to_erase_path
 
   - name: get ceph db partitions
-    shell: |
-      blkid | awk '/ceph block.db/ { sub (":", "", $1); print $1 }'
+    command: |
+      blkid -o device -t PARTLABEL="ceph block.db"
     when: ceph_db_partlabels.rc == 0
     failed_when: false
     register: ceph_db_partition_to_erase_path
 
   - name: get ceph wal partitions
-    shell: |
-      blkid | awk '/ceph block.wal/ { sub (":", "", $1); print $1 }'
+    command: |
+      blkid -o device -t PARTLABEL="ceph block.wal"
     when: ceph_wal_partlabels.rc == 0
     failed_when: false
     register: ceph_wal_partition_to_erase_path
-- 
2.39.5