From 3d62933ae624c1050a0c61383bd3c05a21cb498f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Evrard <jean-philippe.evrard@rackspace.co.uk>
Date: Thu, 2 Jun 2016 14:19:58 +0100
Subject: [PATCH] Consistency for multi-os in the includes

This makes the include_vars consistent accross all the
openstack-ansible-.* repos.

Change-Id: Iba329a0e81fda31cfe6d1cf1f262ceb33848e67d
---
 playbooks/roles/ceph_client/tasks/ceph_all.yml | 2 ++
 tests/roles/bootstrap-host/tasks/main.yml      | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/playbooks/roles/ceph_client/tasks/ceph_all.yml b/playbooks/roles/ceph_client/tasks/ceph_all.yml
index 8bbe1ac6c4..80a5c53ec0 100644
--- a/playbooks/roles/ceph_client/tasks/ceph_all.yml
+++ b/playbooks/roles/ceph_client/tasks/ceph_all.yml
@@ -26,6 +26,8 @@
   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 }}.yml"
   tags:
diff --git a/tests/roles/bootstrap-host/tasks/main.yml b/tests/roles/bootstrap-host/tasks/main.yml
index 84ab362f45..ed738b7b25 100644
--- a/tests/roles/bootstrap-host/tasks/main.yml
+++ b/tests/roles/bootstrap-host/tasks/main.yml
@@ -24,6 +24,8 @@
   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 }}.yml"
   tags: