testnode: Support NVMe partitions in pvs output

Signed-off-by: David Galloway <david.galloway@ibm.com>

diff --git a/roles/testnode/tasks/zap_disks.yml b/roles/testnode/tasks/zap_disks.yml
index 96abd21573b9e1dea0dec80a89b238d1dce115b7..f9b87607a13e5196ef8fad9f2048c0070229fdcc 100644 (file)
--- a/roles/testnode/tasks/zap_disks.yml
+++ b/roles/testnode/tasks/zap_disks.yml
@@ -155,7 +155,7 @@
     DISKS="{{ zap_disks | join('|') }}"
     pvs --no-headings --separator ',' -o pv_name,vg_name \
       | awk -F',' '{gsub(/^ *| *$/,"",$1); gsub(/^ *| *$/,"",$2); print $1" "$2}' \
-      | egrep "/dev/(${DISKS})([0-9]+)?$" | awk '{print $2}' | sort -u || true
+      | egrep "/dev/(${DISKS})(p?[0-9]+)?$" | awk '{print $2}' | sort -u || true
   register: zap_vgs
   changed_when: false
   failed_when: false