From 2d66d08cc329bbd0c2b9803f4601b2f312b51d4e Mon Sep 17 00:00:00 2001
From: Sam Al-Sapti <sam@sapti.me>
Date: Sun, 25 Dec 2022 18:46:53 +0100
Subject: [PATCH] Simplify disks.yml

---
 roles/os_config/tasks/disks.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/roles/os_config/tasks/disks.yml b/roles/os_config/tasks/disks.yml
index 12e6342..9e4299f 100644
--- a/roles/os_config/tasks/disks.yml
+++ b/roles/os_config/tasks/disks.yml
@@ -15,21 +15,17 @@
 
 - name: Get list of mounted devices
   shell: mount
-  register: blk_list
-
-- name: Create var mounted_devices
-  set_fact:
-    mounted_devices: "{{ blk_list.stdout_lines }}"
+  register: mounted_devices
 
 - name: Create filesystems if they do not exist
   filesystem:
     dev: "{{ item }}"
     fstype: ext4
     state: present
-  when: mounted_devices | select('search', item) | list | length == 0
   loop:
     - "/dev/mapper/{{ hdd_name }}"
     - "/dev/mapper/{{ ssd_name }}"
+  when: mounted_devices.stdout_lines | select('search', item) | list | length == 0
 
 - name: Mount filesystems
   mount:
@@ -38,12 +34,12 @@
     fstype: ext4
     fstab: /tmp/fstab.ansible
     state: mounted
-  when: mounted_devices | select('search', item.dev) | list | length == 0
   loop:
     - dev: "/dev/mapper/{{ hdd_name }}"
       path: "{{ hdd_mount_point }}"
     - dev: "/dev/mapper/{{ ssd_name }}"
       path: "{{ ssd_mount_point }}"
+  when: mounted_devices.stdout_lines | select('search', item) | list | length == 0
 
 - name: Check if swapfile is mounted
   shell: "swapon | grep -q '{{ ssd_mount_point }}/swapfile'"