Normalize user-facing defaults

roles/virtualization/tasks/libvirt.yml

@@ -2,7 +2,8 @@
 - name: Set libvirt image paths
   delegate_to: localhost
   vars:
-    virtualization_libvirt_image_dir_value: "{{ vm_path | default('/var/lib/libvirt/images') }}"
+    virtualization_libvirt_image_dir_value: >-
+      {{ vm_path if vm_path | length > 0 else '/var/lib/libvirt/images' }}
   ansible.builtin.set_fact:
     virtualization_libvirt_image_dir: "{{ virtualization_libvirt_image_dir_value }}"
     virtualization_libvirt_disk_path: >-

roles/virtualization/tasks/proxmox.yml

@@ -2,7 +2,7 @@
 - name: Deploy VM on Proxmox
   delegate_to: localhost
   vars:
-    virtualization_dns_value: "{{ vm_dns | default('') }}"
+    virtualization_dns_value: "{{ vm_dns }}"
     virtualization_dns_list_raw: >-
       {{
         virtualization_dns_value
@@ -11,7 +11,7 @@
       }}
     virtualization_dns_list: >-
       {{ virtualization_dns_list_raw | map('trim') | reject('equalto', '') | list }}
-    virtualization_search_value: "{{ vm_dns_search | default('') }}"
+    virtualization_search_value: "{{ vm_dns_search }}"
     virtualization_search_list_raw: >-
       {{
         virtualization_search_value
@@ -33,7 +33,7 @@
     cpu: host
     cores: "{{ vm_cpus }}"
     memory: "{{ vm_memory }}"
-    balloon: "{{ vm_ballo | default(omit) }}"
+    balloon: "{{ vm_ballo if vm_ballo | int > 0 else omit }}"
     numa_enabled: true
     hotplug: network,disk
     update: "{{ virtualization_tpm2_enabled | bool }}"
@@ -57,16 +57,16 @@
       }}
     ide:
       ide0: "{{ boot_iso }},media=cdrom"
-      ide1: "{{ rhel_iso + ',media=cdrom' if rhel_iso is defined else omit }}"
+      ide1: "{{ rhel_iso + ',media=cdrom' if rhel_iso | length > 0 else omit }}"
       ide2: "{{ hypervisor_storage }}:cloudinit"
     net:
-      net0: virtio,bridge={{ vm_nif }}{% if vlan_name is defined and vlan_name %},tag={{ vlan_name }}{% endif %}
+      net0: virtio,bridge={{ vm_nif }}{% if vlan_name | length > 0 %},tag={{ vlan_name }}{% endif %}
     ipconfig:
       ipconfig0: >-
         {{
-          'ip=' ~ vm_ip ~ '/' ~ (vm_nms | default(24))
-          ~ (',gw=' ~ vm_gw if vm_gw is defined and vm_gw | length else '')
-          if vm_ip is defined and vm_ip | length
+          'ip=' ~ vm_ip ~ '/' ~ vm_nms
+          ~ (',gw=' ~ vm_gw if vm_gw | length else '')
+          if vm_ip | length
           else 'ip=dhcp'
         }}
     nameservers: "{{ virtualization_dns_list if virtualization_dns_list | length else omit }}"

roles/virtualization/tasks/vmware.yml

@@ -8,11 +8,11 @@
     validate_certs: false
     datacenter: "{{ hypervisor_datacenter }}"
     cluster: "{{ hypervisor_cluster }}"
-    folder: "{{ vm_path | default(omit) }}"
+    folder: "{{ vm_path if vm_path | length > 0 else omit }}"
     name: "{{ hostname }}"
     guest_id: otherLinux64Guest
     annotation: |
-      {{ note | default('') }}
+      {{ note }}
     state: "{{ 'poweredoff' if virtualization_tpm2_enabled | bool else 'poweredon' }}"
     disk:
       - size_gb: "{{ vm_size }}"
@@ -41,12 +41,12 @@
             "state": "present",
             "type": "iso",
             "iso_path": rhel_iso
-          } ] if rhel_iso is defined and rhel_iso|length > 0 else [] )
+          } ] if rhel_iso | length > 0 else [] )
       }}
     networks:
       - name: "{{ vm_nif }}"
         type: dhcp
-        vlan: "{{ vlan_name | default(omit) }}"
+        vlan: "{{ vlan_name if vlan_name | length > 0 else omit }}"
 
 - name: Ensure vTPM2 is enabled when required
   when: virtualization_tpm2_enabled | bool
@@ -57,7 +57,7 @@
     password: "{{ hypervisor_password }}"
     validate_certs: false
     datacenter: "{{ hypervisor_datacenter }}"
-    folder: "{{ vm_path | default(omit) }}"
+    folder: "{{ vm_path if vm_path | length > 0 else omit }}"
     name: "{{ hostname }}"
     state: present