From 97adeb5668ac1d1079b0208d8201e2983f71e488 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Mon, 15 Oct 2018 20:58:14 +0200 Subject: [PATCH] Default to install network-scripts for initscripts Newer releases of `initscripts` ship the network scripts in a separate package called `network-scripts`. This fixes #81 --- defaults/main.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 2a92813..9c9d9c4 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -27,11 +27,18 @@ _network_packages_default_initscripts_bridge: ["{% if ['bridge'] in network_conn (ansible_distribution == 'Fedora' and ansible_distribution_major_version is version('28', '<=')) ) %}bridge-utils{% endif %}"] +_network_packages_default_initscripts_network_scripts: ["{% +if (ansible_distribution in ['RedHat', 'CentOS'] and ansible_distribution_major_version is version('7', '<=')) or + (ansible_distribution == 'Fedora' and ansible_distribution_major_version is version('28', '<=')) +%}initscripts{% else %}network-scripts{% endif %}"] # convert _network_packages_default_initscripts_bridge to an empty list if it # contains only the empty string and add it to the default package list # |select() filters the list to include only values that evalueate to true (the empty string is false) # |list() converts the generator that |select() creates to a list -network_packages_default_initscripts: "{{ ['ethtool'] + _network_packages_default_initscripts_bridge|select()|list() }}" +network_packages_default_initscripts: "{{ ['ethtool'] ++ _network_packages_default_initscripts_bridge|select()|list() ++ _network_packages_default_initscripts_network_scripts|select()|list() +}}" # The user can explicitly set host variables "network_provider",