jenkins-builder-disk: Use UUID instead of disk name

Avoids disk renaming tomfoolery during boot

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

diff --git a/tools/jenkins-builder-disk.yml b/tools/jenkins-builder-disk.yml
index 84167c7ff7e002776134d149a0d5822351f46392..f5943a74f96d7960acb6d162a9a8e644740e6cd4 100644 (file)
--- a/tools/jenkins-builder-disk.yml
+++ b/tools/jenkins-builder-disk.yml
@@ -69,12 +69,10 @@
       state: latest
     when: ansible_os_family == "Debian"
 
-  - name: Unmount
+  - name: Unmount (ignore if not mounted)
     mount:
       path: "{{ mount_point }}"
-      src: "{{ disk }}"
       state: unmounted
-      fstype: xfs
     ignore_errors: true
 
   - name: Zap disk
@@ -85,9 +83,14 @@
       fstype: xfs
       dev: "{{ disk }}"
 
-  - name: Mount disk
+  - name: Get XFS UUID
+    command: "blkid -s UUID -o value {{ disk }}"
+    register: xfs_uuid
+    changed_when: false
+
+  - name: Mount disk (fstab uses UUID)
     mount:
       path: "{{ mount_point }}"
-      src: "{{ disk }}"
-      state: mounted
+      src: "UUID={{ xfs_uuid.stdout }}"
       fstype: xfs
+      state: mounted