From 52318732bbda05259fc765b2e8d88705f8581a11 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 2 May 2017 11:47:54 +0200
Subject: [PATCH] tasks: name "vars" file by the matching "{{
 ansible_distribution }}"

This fixes the role to run on Fedora and CentOS.
---
 defaults/main.yml                     |  8 +-------
 tasks/main.yml                        | 13 +++++++++----
 vars/CentOS-6.yml                     |  1 +
 vars/RedHat-6.yml                     |  2 +-
 vars/default-initscripts.yml          |  2 ++
 vars/{RedHat-7.yml => default-nm.yml} |  1 +
 vars/default.yml                      |  1 +
 7 files changed, 16 insertions(+), 12 deletions(-)
 create mode 120000 vars/CentOS-6.yml
 mode change 100644 => 120000 vars/RedHat-6.yml
 create mode 100644 vars/default-initscripts.yml
 rename vars/{RedHat-7.yml => default-nm.yml} (71%)
 create mode 120000 vars/default.yml

diff --git a/defaults/main.yml b/defaults/main.yml
index ac00cc9..06ff84d 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,9 +1,3 @@
-network_provider: "{{ network_providers[ansible_os_family][ansible_distribution_major_version] }}"
-
+network_provider: "{{ network_provider_default }}"
 network:
   connections: []
-
-network_providers:
-  RedHat:
-    "6": "initscripts"
-    "7": "nm"
diff --git a/tasks/main.yml b/tasks/main.yml
index 8ae5fbb..4a4dd6d 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,10 +1,15 @@
 - name: Set version specific variables
-  include_vars: "{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml"
+  include_vars: "{{ item }}"
+  with_first_found:
+      - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
+      - "{{ ansible_distribution }}.yml"
+      - "{{ ansible_os_family }}.yml"
+      - "default.yml"
 
 - name: Install packages
-  yum:
-    name: "{{ network_packages | default([]) }}"
-    state: present
+  package:
+      name: "{{ network_packages | default([]) }}"
+      state: present
 
 - name: Enable network service
   service:
diff --git a/vars/CentOS-6.yml b/vars/CentOS-6.yml
new file mode 120000
index 0000000..13b6ae7
--- /dev/null
+++ b/vars/CentOS-6.yml
@@ -0,0 +1 @@
+default-initscripts.yml
\ No newline at end of file
diff --git a/vars/RedHat-6.yml b/vars/RedHat-6.yml
deleted file mode 100644
index f064b20..0000000
--- a/vars/RedHat-6.yml
+++ /dev/null
@@ -1 +0,0 @@
-network_service_name: network
diff --git a/vars/RedHat-6.yml b/vars/RedHat-6.yml
new file mode 120000
index 0000000..13b6ae7
--- /dev/null
+++ b/vars/RedHat-6.yml
@@ -0,0 +1 @@
+default-initscripts.yml
\ No newline at end of file
diff --git a/vars/default-initscripts.yml b/vars/default-initscripts.yml
new file mode 100644
index 0000000..52a39c7
--- /dev/null
+++ b/vars/default-initscripts.yml
@@ -0,0 +1,2 @@
+network_service_name: network
+network_provider_default: initscripts
diff --git a/vars/RedHat-7.yml b/vars/default-nm.yml
similarity index 71%
rename from vars/RedHat-7.yml
rename to vars/default-nm.yml
index d5f93c2..9fc18d3 100644
--- a/vars/RedHat-7.yml
+++ b/vars/default-nm.yml
@@ -1,3 +1,4 @@
 network_service_name: NetworkManager
 network_packages:
   - NetworkManager
+network_provider_default: nm
diff --git a/vars/default.yml b/vars/default.yml
new file mode 120000
index 0000000..f5ceaa2
--- /dev/null
+++ b/vars/default.yml
@@ -0,0 +1 @@
+default-nm.yml
\ No newline at end of file