Merge "MNAIO: If there is no secondary data disk, use the root disk"

multi-node-aio/playbooks/setup-host.yml

@@ -333,37 +333,49 @@
         autostart: yes
       with_dict: "{{ mnaio_host_networks }}"
 
-    - name: Locate the largest writable data disk if mnaio_data_disk is not set
+    - name: If mnaio_data_disk is not set, discover and set it if possible
-      shell: >
-        lsblk -brndo NAME,TYPE,FSTYPE,RO,SIZE | awk '/d[b-z]+ disk +0/{ if ($4>m){m=$4; d=$1}}; END{print d}'
-      register: lsblk
-      changed_when: false
       when:
         - mnaio_data_disk is undefined
+      block:
+        - name: Locate the largest writable data disk if mnaio_data_disk is not set
+          shell: >
+            lsblk -brndo NAME,TYPE,FSTYPE,RO,SIZE | awk '/d[b-z]+ disk +0/{ if ($4>m){m=$4; d=$1}}; END{print d}'
+          register: lsblk
+          changed_when: false
 
-    - name: Setup the data disk partition
+        - name: Set mnaio_data_disk fact if a suitable disk was found
-      parted:
+          set_fact:
-        device: "/dev/{{ mnaio_data_disk | default(lsblk.stdout) }}"
+            mnaio_data_disk: "{{ lsblk.stdout | trim }}"
-        label: gpt
+          when:
-        number: 1
+            - lsblk.stdout | trim != ''
-        name: data1
-        state: present
-      register: _add_partition
 
-    - name: Prepare the data disk file system
+    - name: Setup the data disk if one was set or found
-      filesystem:
-        fstype: ext4
-        dev: "/dev/{{ mnaio_data_disk | default(lsblk.stdout) }}1"
-        force: yes
       when:
-        - _add_partition is changed
+        - mnaio_data_disk is defined
+      block:
+        - name: Setup the data disk partition
+          parted:
+            device: "/dev/{{ mnaio_data_disk }}"
+            label: gpt
+            number: 1
+            name: data1
+            state: present
+          register: _add_partition
 
-    - name: Mount the data disk
+        - name: Prepare the data disk file system
-      mount:
+          filesystem:
-        src: "/dev/{{ mnaio_data_disk | default(lsblk.stdout) }}1"
+            fstype: ext4
-        path: /data
+            dev: "/dev/{{ mnaio_data_disk }}1"
-        state: mounted
+            force: yes
-        fstype: ext4
+          when:
+            - _add_partition is changed
+
+        - name: Mount the data disk
+          mount:
+            src: "/dev/{{ mnaio_data_disk }}1"
+            path: /data
+            state: mounted
+            fstype: ext4
 
     - name: Create the images directory
       file: