From db1fd1362302755d08ffeb04e2f5e4371ae93c24 Mon Sep 17 00:00:00 2001
From: Sandwich <sandwich@archworks.co>
Date: Wed, 30 Oct 2024 22:19:00 +0100
Subject: [PATCH] Fix variable hierarchy

---
 inventory_example.yml              | 1 +
 main.yml                           | 7 ++-----
 roles/configuration/tasks/main.yml | 5 ++---
 roles/environment/tasks/main.yml   | 2 +-
 roles/partitioning/tasks/main.yml  | 2 +-
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/inventory_example.yml b/inventory_example.yml
index 01db918..d24fe7b 100644
--- a/inventory_example.yml
+++ b/inventory_example.yml
@@ -2,6 +2,7 @@ all:
   vars:
     hypervisor: 'proxmox'
     install_drive: '/dev/sda'
+    cis: true
   children:
       promox-kvm:
         hosts:
diff --git a/main.yml b/main.yml
index 5229221..ce1f181 100644
--- a/main.yml
+++ b/main.yml
@@ -20,10 +20,6 @@
         What is your root password?
       confirm: true
   vars_files: vars.yml
-  vars:
-    hypervisor: "vmware"
-    cis: false
-    install_drive: "/dev/sda"
   pre_tasks:
     - name: Set ansible_python_interpreter
       when: os | lower in ["almalinux", "rhel9", "rhel8", "rocky"]
@@ -43,6 +39,7 @@
         that:
           - hypervisor in ["libvirt", "proxmox", "vmware", "none"]
           - filesystem in ["btrfs", "ext4", "xfs"]
+          - install_drive is defined
           - os in ["archlinux", "almalinux", "debian11", "debian12", "fedora", "rhel8", "rhel9", "rocky", "ubuntu", "ubuntu-lts"]
           - os not in ["rhel8", "rhel9"] or rhel_iso is defined
           - (filesystem == "btrfs" and (vm_size | int) >= 10) or (filesystem != "btrfs" and (vm_size | int) >= 20)
@@ -74,7 +71,7 @@
     - role: configuration
 
     - role: cis
-      when: cis == true
+      when: cis | bool
 
     - role: cleanup
       when: install_type == "virtual"
diff --git a/roles/configuration/tasks/main.yml b/roles/configuration/tasks/main.yml
index e641d4d..146d19d 100644
--- a/roles/configuration/tasks/main.yml
+++ b/roles/configuration/tasks/main.yml
@@ -24,9 +24,8 @@
         backrefs: true
 
     - name: Write image from RHEL ISO to the target machine
-      ansible.builtin.command: >
-        "dd if={{ '/dev/sr1' if hypervisor == 'vmware' else '/dev/sr2' }}
-        of=/mnt/usr/local/install/redhat/rhel.iso bs=4M status=progress"
+      when: os in ["rhel8", "rhel9"] and hypervisor == 'vmware'
+      ansible.builtin.command: dd if=/dev/sr1 of=/mnt/usr/local/install/redhat/rhel.iso bs=4M
       changed_when: result.rc == 0
       register: result
 
diff --git a/roles/environment/tasks/main.yml b/roles/environment/tasks/main.yml
index 224cff6..05e7377 100644
--- a/roles/environment/tasks/main.yml
+++ b/roles/environment/tasks/main.yml
@@ -4,7 +4,7 @@
   block:
     - name: Wait for connection
       ansible.builtin.wait_for_connection:
-        timeout: 30
+        timeout: 60
         delay: 5
 
     - name: Gather facts
diff --git a/roles/partitioning/tasks/main.yml b/roles/partitioning/tasks/main.yml
index a1499c0..06d038e 100644
--- a/roles/partitioning/tasks/main.yml
+++ b/roles/partitioning/tasks/main.yml
@@ -36,7 +36,7 @@
         pvs: "{{ install_drive }}{{ main_partition_suffix }}"
 
     - name: Create LVM logical volumes
-      when: cis or (not cis and item.lv != 'var_log' and item.lv != 'var_log_audit')
+      when: cis | bool or item.lv not in ['var_log', 'var_log_audit']
       community.general.lvol:
         vg: sys
         lv: "{{ item.lv }}"