refactor(vars): remove legacy variable inputs

roles/virtualization/tasks/main.yml

@@ -1,3 +1,3 @@
 ---
 - name: Create Virtual Machine
-  ansible.builtin.include_tasks: "{{ hypervisor }}.yml"
+  ansible.builtin.include_tasks: "{{ hypervisor_type }}.yml"

roles/virtualization/tasks/proxmox.yml

@@ -23,17 +23,17 @@
     virtualization_proxmox_scsi: >-
       {%- set out = {} -%}
       {%- for disk in system_cfg.disks -%}
-      {%- set _ = out.update({ 'scsi' ~ loop.index0: hypervisor_storage ~ ':' ~ (disk.size | int) }) -%}
+      {%- set _ = out.update({ 'scsi' ~ loop.index0: hypervisor_cfg.storage ~ ':' ~ (disk.size | int) }) -%}
       {%- endfor -%}
       {{ out }}
   community.proxmox.proxmox_kvm:
-    api_host: "{{ hypervisor_url }}"
-    api_user: "{{ hypervisor_username }}"
-    api_password: "{{ hypervisor_password }}"
+    api_host: "{{ hypervisor_cfg.url }}"
+    api_user: "{{ hypervisor_cfg.username }}"
+    api_password: "{{ hypervisor_cfg.password }}"
     ciuser: "{{ user_name }}"
     cipassword: "{{ user_password }}"
     ciupgrade: false
-    node: "{{ hypervisor_node }}"
+    node: "{{ hypervisor_cfg.node }}"
     vmid: "{{ system_cfg.id }}"
     name: "{{ hostname }}"
     cpu: host
@@ -53,17 +53,17 @@
       efitype: 4m
       format: raw
       pre_enrolled_keys: false
-      storage: "{{ hypervisor_storage }}"
+      storage: "{{ hypervisor_cfg.storage }}"
     tpmstate0: >-
       {{
-        {'storage': hypervisor_storage, 'version': '2.0'}
+        {'storage': hypervisor_cfg.storage, 'version': '2.0'}
         if virtualization_tpm2_enabled | bool
         else omit
       }}
     ide:
       ide0: "{{ boot_iso }},media=cdrom"
       ide1: "{{ rhel_iso + ',media=cdrom' if rhel_iso is defined and rhel_iso | length > 0 else omit }}"
-      ide2: "{{ hypervisor_storage }}:cloudinit"
+      ide2: "{{ hypervisor_cfg.storage }}:cloudinit"
     net:
       net0: >-
         virtio,bridge={{ system_cfg.network }}{% if system_cfg.vlan is defined and system_cfg.vlan | string | length > 0 %},tag={{ system_cfg.vlan }}{% endif %}
@@ -83,10 +83,10 @@
 - name: Start VM on Proxmox
   delegate_to: localhost
   community.proxmox.proxmox_kvm:
-    api_host: "{{ hypervisor_url }}"
-    api_user: "{{ hypervisor_username }}"
-    api_password: "{{ hypervisor_password }}"
-    node: "{{ hypervisor_node }}"
+    api_host: "{{ hypervisor_cfg.url }}"
+    api_user: "{{ hypervisor_cfg.username }}"
+    api_password: "{{ hypervisor_cfg.password }}"
+    node: "{{ hypervisor_cfg.node }}"
     name: "{{ hostname }}"
     vmid: "{{ system_cfg.id }}"
     state: started

roles/virtualization/tasks/vmware.yml

@@ -6,7 +6,7 @@
     virtualization_vmware_disk_cfg:
       size_gb: "{{ item.size | int }}"
       type: thin
-      datastore: "{{ hypervisor_storage }}"
+      datastore: "{{ hypervisor_cfg.storage }}"
   loop: "{{ system_cfg.disks }}"
   loop_control:
     label: "{{ item | to_json }}"
@@ -15,12 +15,12 @@
 - name: Create VM in vCenter
   delegate_to: localhost
   community.vmware.vmware_guest:
-    hostname: "{{ hypervisor_url }}"
-    username: "{{ hypervisor_username }}"
-    password: "{{ hypervisor_password }}"
-    validate_certs: "{{ hypervisor_validate_certs }}"
-    datacenter: "{{ hypervisor_datacenter }}"
-    cluster: "{{ hypervisor_cluster }}"
+    hostname: "{{ hypervisor_cfg.url }}"
+    username: "{{ hypervisor_cfg.username }}"
+    password: "{{ hypervisor_cfg.password }}"
+    validate_certs: "{{ hypervisor_cfg.validate_certs | bool }}"
+    datacenter: "{{ hypervisor_cfg.datacenter }}"
+    cluster: "{{ hypervisor_cfg.cluster }}"
     folder: "{{ system_cfg.path if system_cfg.path | string | length > 0 else omit }}"
     name: "{{ hostname }}"
     guest_id: otherLinux64Guest
@@ -71,11 +71,11 @@
   when: virtualization_tpm2_enabled | bool
   delegate_to: localhost
   community.vmware.vmware_guest_tpm:
-    hostname: "{{ hypervisor_url }}"
-    username: "{{ hypervisor_username }}"
-    password: "{{ hypervisor_password }}"
-    validate_certs: "{{ hypervisor_validate_certs }}"
-    datacenter: "{{ hypervisor_datacenter }}"
+    hostname: "{{ hypervisor_cfg.url }}"
+    username: "{{ hypervisor_cfg.username }}"
+    password: "{{ hypervisor_cfg.password }}"
+    validate_certs: "{{ hypervisor_cfg.validate_certs | bool }}"
+    datacenter: "{{ hypervisor_cfg.datacenter }}"
     folder: "{{ system_cfg.path if system_cfg.path | string | length > 0 else omit }}"
     name: "{{ hostname }}"
     state: present
@@ -84,11 +84,11 @@
   when: virtualization_tpm2_enabled | bool
   delegate_to: localhost
   vmware.vmware.vm_powerstate:
-    hostname: "{{ hypervisor_url }}"
-    username: "{{ hypervisor_username }}"
-    password: "{{ hypervisor_password }}"
-    validate_certs: "{{ hypervisor_validate_certs }}"
-    datacenter: "{{ hypervisor_datacenter }}"
+    hostname: "{{ hypervisor_cfg.url }}"
+    username: "{{ hypervisor_cfg.username }}"
+    password: "{{ hypervisor_cfg.password }}"
+    validate_certs: "{{ hypervisor_cfg.validate_certs | bool }}"
+    datacenter: "{{ hypervisor_cfg.datacenter }}"
     name: "{{ hostname }}"
     state: powered-on
   register: virtualization_vmware_start_result