From a022dea5829f95633d741c8e2eca6576e3eac19f Mon Sep 17 00:00:00 2001 From: Ian Hill Date: Mon, 8 Jul 2019 16:54:15 +0100 Subject: [PATCH] Added OracleLinux as a RHEL clone for package detection purposes. --- defaults/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index e5c8c6f..94cf840 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -4,7 +4,7 @@ network_connections: [] # Use initscripts for RHEL/CentOS < 7, nm otherwise network_provider_os_default: "{{ - 'initscripts' if ansible_distribution in ['RedHat', 'CentOS'] and + 'initscripts' if ansible_distribution in ['RedHat', 'CentOS', 'OracleLinux'] and ansible_distribution_major_version is version('7', '<') else 'nm' }}" # If NetworkManager.service is running, assume that 'nm' is currently in-use, @@ -34,12 +34,12 @@ network_service_name_default_initscripts: network # 'bridge' type is used in network_connections _network_packages_default_initscripts_bridge: ["{% if ['bridge'] in network_connections|json_query('[*][type]') and ( - (ansible_distribution in ['RedHat', 'CentOS'] and ansible_distribution_major_version is version('7', '<=')) or + (ansible_distribution in ['RedHat', 'CentOS', 'OracleLinux'] and ansible_distribution_major_version is version('7', '<=')) or (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 +if (ansible_distribution in ['RedHat', 'CentOS', 'OracleLinux'] 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