Reverse order of variable inclusions so specific vars can override generics.
This commit is contained in:
parent
7112b29de5
commit
6e0cb0e02a
|
@ -1,12 +1,5 @@
|
||||||
---
|
---
|
||||||
# Variable setup.
|
# 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.
|
- name: Set the default PHP version for Debian-based OSes.
|
||||||
set_fact:
|
set_fact:
|
||||||
php_default_version_debian: "{{ __php_default_version_debian }}"
|
php_default_version_debian: "{{ __php_default_version_debian }}"
|
||||||
|
@ -15,6 +8,13 @@
|
||||||
- name: Include OS-specific variables.
|
- name: Include OS-specific variables.
|
||||||
include_vars: "{{ ansible_os_family }}.yml"
|
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.
|
- name: Define php_packages.
|
||||||
set_fact:
|
set_fact:
|
||||||
php_packages: "{{ __php_packages | list }}"
|
php_packages: "{{ __php_packages | list }}"
|
||||||
|
|
Loading…
Reference in New Issue