From 58a4ef729f25cdea4c3d148285f7b2efdefca2af Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Wed, 12 Aug 2015 10:11:03 -0500 Subject: [PATCH] testnode: fix var file loading order We want to load distro specific variables before we load major version specific variables. Loading of vars should happen in this order: package manager, distro, major version, version. Signed-off-by: Andrew Schoen --- roles/testnode/tasks/vars.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/testnode/tasks/vars.yml b/roles/testnode/tasks/vars.yml index cc7a704..2c955d1 100644 --- a/roles/testnode/tasks/vars.yml +++ b/roles/testnode/tasks/vars.yml @@ -2,16 +2,16 @@ - name: Include package type specific vars. include_vars: "{{ ansible_pkg_mgr }}_systems.yml" -- name: Including major version specific variables. +- name: Including distro specific variables. include_vars: "{{ item }}" with_first_found: - - "{{ ansible_distribution | lower }}_{{ ansible_distribution_major_version }}.yml" + - "{{ ansible_distribution | lower }}.yml" - empty.yml -- name: Including distro specific variables. +- name: Including major version specific variables. include_vars: "{{ item }}" with_first_found: - - "{{ ansible_distribution | lower }}.yml" + - "{{ ansible_distribution | lower }}_{{ ansible_distribution_major_version }}.yml" - empty.yml - name: Including version specific variables. -- 2.39.5