From 3da5d970203b4d9b244573ff6ab0883aeb048616 Mon Sep 17 00:00:00 2001 From: Adrien Date: Sun, 23 Aug 2020 01:25:34 +0200 Subject: [PATCH] Update include_vars methode --- tasks/main.yml | 5 ++++- vars/{RedHat_7.yml => RedHat.yml} | 0 vars/RedHat_8.yml | 4 ---- 3 files changed, 4 insertions(+), 5 deletions(-) rename vars/{RedHat_7.yml => RedHat.yml} (100%) delete mode 100644 vars/RedHat_8.yml diff --git a/tasks/main.yml b/tasks/main.yml index ec206dc..f773fd1 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -2,7 +2,10 @@ - name: WireGuard setup block: - name: Include vars for {{ ansible_os_family }} - include_vars: "{{ ansible_os_family }}_{{ ansible_distribution_major_version }}.yml" + include_vars: "{{ item }}" + with_first_found: + - "{{ ansible_os_family }}_{{ ansible_distribution_major_version }}.yml" + - "{{ ansible_os_family }}.yml" - name: Pre-installation include_tasks: "install_{{ ansible_os_family }}.yml" diff --git a/vars/RedHat_7.yml b/vars/RedHat.yml similarity index 100% rename from vars/RedHat_7.yml rename to vars/RedHat.yml diff --git a/vars/RedHat_8.yml b/vars/RedHat_8.yml deleted file mode 100644 index 39f5d41..0000000 --- a/vars/RedHat_8.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -wireguard_packages: - - kmod-wireguard - - wireguard-tools