Drop support for Fedora 28 and add Fedora 30 and 31 (#5969)

roles/bootstrap-os/tasks/bootstrap-fedora.yml

@@ -29,19 +29,17 @@
     - http_proxy is defined
     - need_http_proxy.rc != 0
 
-# Fedora's policy as of Fedora 30 is to still install python2 as /usr/bin/python
-# See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 for the current status
-- name: Install python on fedora
-  raw: "dnf install --assumeyes --quiet python2"
+- name: Install python3 on fedora
+  raw: "dnf install --assumeyes --quiet python3"
   become: true
   environment: {}
   when:
     - need_bootstrap.rc != 0
 
-# libselinux-python is required on SELinux enabled hosts
+# libselinux-python3 is required on SELinux enabled hosts
 # See https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html#managed-node-requirements
-- name: Install libselinux-python
+- name: Install libselinux-python3
   package:
-    name: libselinux-python
+    name: libselinux-python3
     state: present
   become: true

roles/container-engine/docker/tasks/main.yml

@@ -47,6 +47,21 @@
   tags:
     - facts
 
+- name: disable unified_cgroup_hierarchy in Fedora 31+
+  shell:
+    cmd: grubby --update-kernel=ALL --args="systemd.unified_cgroup_hierarchy=0"
+  when:
+    - ansible_distribution == "Fedora"
+    - (ansible_distribution_major_version | int) >= 31
+    - ansible_proc_cmdline['systemd.unified_cgroup_hierarchy'] is not defined or ansible_proc_cmdline['systemd.unified_cgroup_hierarchy'] != '0'
+
+- name: reboot in Fedora 31+
+  reboot:
+  when:
+    - ansible_distribution == "Fedora"
+    - (ansible_distribution_major_version | int) >= 31
+    - ansible_proc_cmdline['systemd.unified_cgroup_hierarchy'] is not defined or ansible_proc_cmdline['systemd.unified_cgroup_hierarchy'] != '0'
+
 - import_tasks: pre-upgrade.yml
 
 - name: ensure docker-ce repository public key is installed

roles/kubernetes/preinstall/vars/fedora.yml

@@ -1,5 +1,5 @@
 ---
 required_pkgs:
-  - libselinux-python
+  - libselinux-python3
   - device-mapper-libs
   - conntrack