From db39fee2372410acafc21f5a2829ffb92a6bf15f Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Thu, 2 Jun 2016 14:18:55 +0100 Subject: [PATCH] Consistency for multi-os in the includes This makes the include_vars consistent accross all the openstack-ansible-.* repos. Change-Id: I750dfaba1c4f717b03054ed2af2aa73722c77f71 --- tasks/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tasks/main.yml b/tasks/main.yml index 12de9c76..f380d76b 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -28,8 +28,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