openstack/openstack-ansible
Code Issues Proposed changes

Merge "Consistency for multi-os in the includes"

Browse Source
This commit is contained in:
Jenkins 2016-06-02 15:25:50 +00:00 committed by Gerrit Code Review
commit 77cd6b1d3f
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/roles/ceph_client/tasks/ceph_all.yml
View File

@ -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:

2
tests/roles/bootstrap-host/tasks/main.yml
View File

@ -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: