From 85f16ddf6feedc0ea404958a962601d4c2ade532 Mon Sep 17 00:00:00 2001
From: Till Maas <opensource@till.name>
Date: Wed, 27 Nov 2019 16:49:40 +0100
Subject: [PATCH 1/2] 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

From 6cfcfc430c4403d02dead51656d5dee39fed8ab3 Mon Sep 17 00:00:00 2001
From: Till Maas <opensource@till.name>
Date: Wed, 27 Nov 2019 16:53:47 +0100
Subject: [PATCH 2/2] Defaults: Remove conditions for unsupported Fedora
 releases

---
 defaults/main.yml | 17 ++++-------------
 meta/main.yml     |  3 +--
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 70ed6b6..c95b237 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -23,7 +23,6 @@ network_provider: "{{ network_provider_current }}"
 # The python-gobject-base package depends on the python version and
 # distribution:
 # - python-gobject-base on RHEL7 (no python2-gobject-base :-/)
-# - python-gobject-base or python2-gobject-base on Fedora 27
 # - python3-gobject-base on Fedora 28+
 network_service_name_default_nm: NetworkManager
 network_packages_default_nm:
@@ -38,20 +37,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', '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', '<=')
 %}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', '<=')
 %}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
diff --git a/meta/main.yml b/meta/main.yml
index b350d57..aa8f2e3 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -17,9 +17,8 @@ galaxy_info:
   platforms:
     - name: Fedora
       versions:
-        - 28
-        - 29
         - 30
+        - 31
     - name: EL
       versions:
         - 6