From 6be464a0e2966a317490f30b864906317592a5bc Mon Sep 17 00:00:00 2001 From: Sandwich Date: Mon, 15 Apr 2024 21:23:32 +0200 Subject: [PATCH] move assertion list to main playbook --- .gitignore | 1 + main.yml | 6 +++--- vars_example.yml | 3 --- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 8e04b75..2c04c7f 100644 --- 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 index 11dd725..4e7b86b 100644 --- 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 index dafe85a..d0320bc 100644 --- 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