From 85f16ddf6feedc0ea404958a962601d4c2ade532 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Wed, 27 Nov 2019 16:49:40 +0100 Subject: [PATCH] Defaults: Break long lines --- defaults/main.yml | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 94cf840..70ed6b6 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -4,8 +4,11 @@ network_connections: [] # Use initscripts for RHEL/CentOS < 7, nm otherwise network_provider_os_default: "{{ - 'initscripts' if ansible_distribution in ['RedHat', 'CentOS', 'OracleLinux'] and - ansible_distribution_major_version is version('7', '<') + '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, # otherwise initscripts @@ -26,21 +29,29 @@ network_service_name_default_nm: NetworkManager network_packages_default_nm: - ethtool - NetworkManager - - "python{{ ansible_python['version']['major'] | replace('2', '') }}-gobject-base" + - "python{{ ansible_python['version']['major'] | replace('2', '') + }}-gobject-base" network_service_name_default_initscripts: network # initscripts requires bridge-utils to manage bridges, install it when the # 'bridge' type is used in network_connections -_network_packages_default_initscripts_bridge: ["{% if ['bridge'] in network_connections|json_query('[*][type]') and +_network_packages_default_initscripts_bridge: ["{% +if ['bridge'] in network_connections|json_query('[*][type]') and ( - (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', '<=')) + (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', 'OracleLinux'] and ansible_distribution_major_version is version('7', '<=')) or - (ansible_distribution == 'Fedora' and ansible_distribution_major_version is version('28', '<=')) +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 # contains only the empty string and add it to the default package list