Browse Source
Use cgroupsv2 where available (fedora) (#8237)
* Containerd: use cgroupsv2 where available (fedora)
* Docker: use cgroupsv2 where available (fedora)
* cri-o: use cgroupsv2 where available (fedora)
pull/8232/head
Cristian Calin
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
0 additions and
46 deletions
-
roles/container-engine/containerd/tasks/main.yml
-
roles/container-engine/cri-o/tasks/main.yaml
-
roles/container-engine/docker/tasks/main.yml
|
|
|
@ -5,22 +5,6 @@ |
|
|
|
when: |
|
|
|
- ansible_distribution not in ["CentOS", "OracleLinux", "RedHat", "Ubuntu", "Debian", "Fedora", "AlmaLinux", "Rocky", "Amazon", "Flatcar", "Flatcar Container Linux by Kinvolk", "Suse", "openSUSE Leap", "openSUSE Tumbleweed"] |
|
|
|
|
|
|
|
- name: disable unified_cgroup_hierarchy in Fedora 31+ |
|
|
|
command: 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' |
|
|
|
- not is_ostree |
|
|
|
|
|
|
|
- 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' |
|
|
|
- not is_ostree |
|
|
|
|
|
|
|
- name: containerd | Remove any package manager controlled containerd package |
|
|
|
package: |
|
|
|
name: "{{ containerd_package }}" |
|
|
|
|
|
|
|
@ -35,22 +35,6 @@ |
|
|
|
tags: |
|
|
|
- facts |
|
|
|
|
|
|
|
- name: disable unified_cgroup_hierarchy in Fedora 31+ |
|
|
|
command: 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' |
|
|
|
- not is_ostree |
|
|
|
|
|
|
|
- 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' |
|
|
|
- not is_ostree |
|
|
|
|
|
|
|
- name: import crio repo |
|
|
|
import_tasks: "crio_repo.yml" |
|
|
|
when: crio_add_repos |
|
|
|
|
|
|
|
@ -40,20 +40,6 @@ |
|
|
|
tags: |
|
|
|
- facts |
|
|
|
|
|
|
|
- name: disable unified_cgroup_hierarchy in Fedora 31+ |
|
|
|
command: 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 |
|
|
|
|
