From 28c7e67aeb62ae53305bfc5f8ee8db38b6ae10de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Krupa?= <pawel@krupa.net.pl>
Date: Wed, 11 Sep 2019 11:48:11 +0200
Subject: [PATCH] [minor] port variables file discovery from OpenStack-Ansible
---
tasks/main.yml | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tasks/main.yml b/tasks/main.yml
index 0413c6c..c29276c 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,9 +2,12 @@
- name: Gather variables for each operating system
include_vars: "{{ item }}"
with_first_found:
- - "{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version }}.yml"
- - "{{ ansible_distribution | lower }}.yml"
+ - "{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml"
+ - "{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
- "{{ ansible_distribution_file_variety | 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:
- node_exporter_install
--
GitLab