From 0303d82cd6931edcab4bbcb58de90cbaa30a01d8 Mon Sep 17 00:00:00 2001
From: Chris Coley <chris@codingallnight.com>
Date: Wed, 4 Jul 2018 22:56:11 -0700
Subject: [PATCH] Remove an unnecessary Fedora specific vars file
---
tasks/main.yml | 13 +++++++------
vars/fedora.yml | 9 ---------
2 files changed, 7 insertions(+), 15 deletions(-)
delete mode 100644 vars/fedora.yml
diff --git a/tasks/main.yml b/tasks/main.yml
index 4b29d70..31bd047 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,12 +2,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
# Set hostname
- block:
diff --git a/vars/fedora.yml b/vars/fedora.yml
deleted file mode 100644
index a7cea7a..0000000
--- a/vars/fedora.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-# This file overrides variables set in defaults/main.yml.
-# Full documentation of the variables is available in that file.
-
-required_utils:
- - python-dnf
- - libselinux-python
-...
-# vi: set ts=2 sts=2 sw=2 et ft=yaml:
--
GitLab