From 11bf6fe4c835e255b7c0f35f7c36f55de2da02f8 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 19 Sep 2022 21:34:45 +0200 Subject: [PATCH] chore: remove grub config --- defaults/main.yml | 3 --- molecule/centos7/converge.yml | 2 +- molecule/rocky8/converge.yml | 3 +-- tasks/cgroup.yml | 37 ----------------------------------- tasks/main.yml | 4 ---- 5 files changed, 2 insertions(+), 47 deletions(-) delete mode 100644 tasks/cgroup.yml diff --git a/defaults/main.yml b/defaults/main.yml index f339cd2..b5de99f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -18,8 +18,5 @@ kernel_blacklist_modules: [] kernel_namespace_support_enabled: False kernel_coredump_enabled: True -kernel_cgroup_v2_enabled: False - -kernel_grub_rebuild_force: False kernel_ipv6_enabled: False diff --git a/molecule/centos7/converge.yml b/molecule/centos7/converge.yml index 9001339..0810ee7 100644 --- a/molecule/centos7/converge.yml +++ b/molecule/centos7/converge.yml @@ -3,6 +3,6 @@ hosts: all vars: kernel_coredump_enabled: False - + kernel_ipv6_enabled: True roles: - role: xoxys.kernel diff --git a/molecule/rocky8/converge.yml b/molecule/rocky8/converge.yml index d1783bb..0810ee7 100644 --- a/molecule/rocky8/converge.yml +++ b/molecule/rocky8/converge.yml @@ -3,7 +3,6 @@ hosts: all vars: kernel_coredump_enabled: False - kernel_cgroup_v2_enabled: True - + kernel_ipv6_enabled: True roles: - role: xoxys.kernel diff --git a/tasks/cgroup.yml b/tasks/cgroup.yml deleted file mode 100644 index 3298d29..0000000 --- a/tasks/cgroup.yml +++ /dev/null @@ -1,37 +0,0 @@ ---- -- name: Ensure grubby is installed - package: - name: grubby - state: present - -- name: Check current state of cgroup - command: grep -Eq '^kernelopts=.* systemd\.unified_cgroup_hierarchy=1' /boot/grub2/grubenv - register: __kernel_cgroup_exception - check_mode: False - failed_when: False - changed_when: False - -- name: Enabled cgroup v2 configuration - command: grubby --update-kernel=ALL --args="systemd.unified_cgroup_hierarchy=1" - when: - - __kernel_cgroup_exception.rc != 0 - - kernel_cgroup_v2_enabled | bool - notify: - - __kernel_grub_rebuild - - __kernel_server_restart - -- name: Disable cgroup v2 configuration - command: grubby --update-kernel=ALL --remove-args="systemd.unified_cgroup_hierarchy" - when: - - __kernel_cgroup_exception.rc == 0 - - not kernel_cgroup_v2_enabled | bool - notify: - - __kernel_grub_rebuild - - __kernel_server_restart - -- name: Force rebuild grub config and reboot - command: /bin/true - notify: - - __kernel_grub_rebuild - - __kernel_server_restart - when: kernel_grub_rebuild_force | bool diff --git a/tasks/main.yml b/tasks/main.yml index c631ab2..ddcda06 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -2,7 +2,3 @@ - include_tasks: kernel.yml - include_tasks: coredump.yml when: not (kernel_coredump_enabled | bool) -- include_tasks: cgroup.yml - when: - - ansible_os_family | lower == "redhat" - - ansible_distribution_major_version == "8"