move assertion list to main playbook

YourSandwich · Apr 15, 2024 · 6be464a · 6be464a
1 parent 48b5f60
commit 6be464a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,5 @@ inventory_libvirt.yml
 
 vars.yml
 vars.yaml
+vars_kvm.yml
 vars_libvirt.yml
diff --git a/main.yml b/main.yml
@@ -45,9 +45,9 @@
     - name: Validate variables
       assert:
         that:
-          - hypervisor in hypervisor_list
-          - filesystem in filesystem_list
-          - os in os_list
+          - hypervisor in ["libvirt", "proxmox", "vmware", "none"]
+          - filesystem in ["btrfs", "ext4", "xfs"]
+          - os in ["archlinux", "almalinux", "debian11", "debian12", "fedora"]
         fail_msg: "Invalid input specified, please try again"
 
     - name: Set connection

diff --git a/vars_example.yml b/vars_example.yml
@@ -4,9 +4,6 @@ ansible_become_password: "{{ user_password }}"
 ansible_ssh_extra_args: '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no'
 
 vm_ip: "{{ inventory_hostname }}/24"
-hypervisor_list: ["libvirt", "proxmox", "vmware", "none"]
-filesystem_list: ["btrfs", "ext4", "xfs"]
-os_list: ["archlinux", "almalinux", "debian11", "debian12", "fedora"]
 install_type: "virtual"
 cis: false