From c574469fbd5a18e47637c9388ace19d5c03c0010 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Mon, 22 Feb 2021 13:55:56 -0700 Subject: [PATCH] Update skeleton role to use ansible_facts Change-Id: I6172f3a3ffa6bc7cfe6b57b198ad3e761d305676 (cherry picked from commit c0876630bdcdcf0dc297ff99c9de793f4e1573a5) --- _skeleton_role_/tasks/main.yml.j2 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/_skeleton_role_/tasks/main.yml.j2 b/_skeleton_role_/tasks/main.yml.j2 index dff12fc30..1a11af54a 100644 --- a/_skeleton_role_/tasks/main.yml.j2 +++ b/_skeleton_role_/tasks/main.yml.j2 @@ -23,12 +23,12 @@ with_first_found: - skip: true files: - - "{{ 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" + - "{{ ansible_facts['distribution'] | lower }}-{{ ansible_facts['distribution_version'] | lower }}.yml" + - "{{ ansible_facts['distribution'] | lower }}-{{ ansible_facts['distribution_major_version'] | lower }}.yml" + - "{{ ansible_facts['os_family'] | lower }}-{{ ansible_facts['distribution_major_version'] | lower }}.yml" + - "{{ ansible_facts['distribution'] | lower }}.yml" + - "{{ ansible_facts['os_family'] | lower }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml" + - "{{ ansible_facts['os_family'] | lower }}.yml" tags: - always {% endraw %}