From 5f30c5b5e3b0faab31b1d03daa642f0fdf8f77c0 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Mon, 2 Jul 2018 14:39:23 +0200 Subject: [PATCH] Use set_facts to set default provider This avoids symlinks that do not work on Windows: https://github.com/linux-system-roles/network/pull/64#issuecomment-401740870 --- tasks/main.yml | 17 ++++++++++------- tests/roles/linux-system-roles.network/vars | 1 - vars/CentOS-6.yml | 1 - vars/RedHat-6.yml | 1 - vars/default-initscripts.yml | 2 -- vars/default-nm.yml | 2 -- vars/default.yml | 1 - 7 files changed, 10 insertions(+), 15 deletions(-) delete mode 120000 tests/roles/linux-system-roles.network/vars delete mode 120000 vars/CentOS-6.yml delete mode 120000 vars/RedHat-6.yml delete mode 100644 vars/default-initscripts.yml delete mode 100644 vars/default-nm.yml delete mode 120000 vars/default.yml diff --git a/tasks/main.yml b/tasks/main.yml index 6204c80..ad65506 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,11 +1,14 @@ # SPDX-License-Identifier: BSD-3-Clause -- name: Set version specific variables - include_vars: "{{ item }}" - with_first_found: - - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml" - - "{{ ansible_distribution }}.yml" - - "{{ ansible_os_family }}.yml" - - "default.yml" +- name: Define default provider as nm + set_fact: + network_provider_default: nm + +- name: Override default provider to initscipts for older systems + set_fact: + network_provider_default: initscripts + when: + - ansible_distribution_major_version == "6" + - ansible_distribution == "CentOS" or ansible_distribution == "RedHat" # needed for ansible_facst.packages - name: Check which packages are installed diff --git a/tests/roles/linux-system-roles.network/vars b/tests/roles/linux-system-roles.network/vars deleted file mode 120000 index 338c9ad..0000000 --- a/tests/roles/linux-system-roles.network/vars +++ /dev/null @@ -1 +0,0 @@ -../../../vars/ \ No newline at end of file diff --git a/vars/CentOS-6.yml b/vars/CentOS-6.yml deleted file mode 120000 index 13b6ae7..0000000 --- a/vars/CentOS-6.yml +++ /dev/null @@ -1 +0,0 @@ -default-initscripts.yml \ No newline at end of file diff --git a/vars/RedHat-6.yml b/vars/RedHat-6.yml deleted file mode 120000 index 13b6ae7..0000000 --- a/vars/RedHat-6.yml +++ /dev/null @@ -1 +0,0 @@ -default-initscripts.yml \ No newline at end of file diff --git a/vars/default-initscripts.yml b/vars/default-initscripts.yml deleted file mode 100644 index ca07a6f..0000000 --- a/vars/default-initscripts.yml +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -network_provider_default: initscripts diff --git a/vars/default-nm.yml b/vars/default-nm.yml deleted file mode 100644 index 66ca8d2..0000000 --- a/vars/default-nm.yml +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -network_provider_default: nm diff --git a/vars/default.yml b/vars/default.yml deleted file mode 120000 index f5ceaa2..0000000 --- a/vars/default.yml +++ /dev/null @@ -1 +0,0 @@ -default-nm.yml \ No newline at end of file