From e13f5a6e896d5d8d943e7e082c8fc33cecf216d8 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Thu, 2 Jun 2016 14:19:12 +0100 Subject: [PATCH] Consistency for multi-os in the includes This makes the include_vars consistent accross all the openstack-ansible-.* repos. Change-Id: Ic8697f32b3156954217531402b5c095de351e584 --- tasks/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tasks/main.yml b/tasks/main.yml index e26478da..67cfe76d 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -35,8 +35,9 @@ include_vars: "{{ item }}" with_first_found: - "{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml" + - "{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml" + - "{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yml" - "{{ ansible_distribution | lower }}.yml" - - "{{ ansible_os_family | lower }}-{{ ansible_distribution_version.split('.')[0] }}.yml" - "{{ ansible_os_family | lower }}.yml" tags: - always