From efc005b98cded6c460d238cfb781389f5baec5ee Mon Sep 17 00:00:00 2001
From: Chris Coley <chris@codingallnight.com>
Date: Sat, 30 Jun 2018 00:00:18 -0700
Subject: [PATCH] Skip gathering OS specific vars if they don't exist
---
tasks/bootstrap.yml | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/tasks/bootstrap.yml b/tasks/bootstrap.yml
index 8e87d65..a840b3f 100644
--- a/tasks/bootstrap.yml
+++ b/tasks/bootstrap.yml
@@ -19,12 +19,13 @@
- name: Gather OS specific vars
include_vars: '{{ item }}'
with_first_found:
- - vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml
- - vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_release | lower }}.yml
- - vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml
- - vars/{{ ansible_distribution | lower }}.yml
- - vars/{{ ansible_os_family | lower }}.yml
- - defaults/main.yml
+ - files:
+ - vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml
+ - vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_release | lower }}.yml
+ - vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml
+ - vars/{{ ansible_distribution | lower }}.yml
+ - vars/{{ ansible_os_family | lower }}.yml
+ skip: true
- include_tasks: '{{ item }}'
with_first_found:
@@ -35,4 +36,4 @@
- tasks/bootstrap_{{ ansible_os_family | lower }}.yml
tags: bootstrap
...
-# vi: set ts=2 sts=2 sw=2 et ft=yaml:
+# vi: set ts=2 sts=2 sw=2 et ft=yaml:
--
GitLab