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