From 6e0cb0e02ad993929a356d9d0e6c563af9b628bf Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Wed, 2 Feb 2022 13:21:11 -0600 Subject: [PATCH] Reverse order of variable inclusions so specific vars can override generics. --- tasks/main.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index dbad765..8e096e4 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,12 +1,5 @@ --- # Variable setup. -- name: Include distribution and version-specific vars. - include_vars: "{{ item }}" - with_first_found: - - files: - - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml" - skip: true - - name: Set the default PHP version for Debian-based OSes. set_fact: php_default_version_debian: "{{ __php_default_version_debian }}" @@ -15,6 +8,13 @@ - name: Include OS-specific variables. include_vars: "{{ ansible_os_family }}.yml" +- name: Include distribution and version-specific vars. + include_vars: "{{ item }}" + with_first_found: + - files: + - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml" + skip: true + - name: Define php_packages. set_fact: php_packages: "{{ __php_packages | list }}"