commit 2557f321ab86bba4cbf463eaf69df8d1bb3a2261
Author: Bernd Finger <bfinger@redhat.com>
Date:   Mon Sep 6 09:26:10 2021 +0200

    use grubby for setting tsx=on; set min kernel version for RHEL 8.4 x86_64

diff --git a/handlers/main.yml b/handlers/main.yml
index 0d81021..8387bc7 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -49,6 +49,12 @@
     - __sap_hana_preconfigure_register_stat_sys_firmware_efi.stat.exists
     - sap_hana_preconfigure_run_grub2_mkconfig|d(true)
 
+- name: "Run grubby"
+  command: grubby --args="tsx=on" --update-kernel=ALL
+  register: __sap_hana_preconfigure_register_grubby_update
+  listen: __sap_hana_preconfigure_grubby_update_handler
+  notify: __sap_hana_preconfigure_reboot_handler
+
 - name: Reboot the managed node
   reboot:
     test_command: /bin/true
diff --git a/tasks/RedHat/generic/enable-tsx.yml b/tasks/RedHat/generic/enable-tsx.yml
index c4be81c..09b87d3 100644
--- a/tasks/RedHat/generic/enable-tsx.yml
+++ b/tasks/RedHat/generic/enable-tsx.yml
@@ -4,21 +4,11 @@
     msg: "imported RedHat/generic/enable-tsx.yml"
 
 - name: Enable TSX at boot time
-  lineinfile:
-    path: /etc/default/grub
-    backup: yes
-    backrefs: yes
-    state: present
-    regexp: '^(GRUB_CMDLINE_LINUX=(?!.* {{ line_item }}).*). *$'
-    line: "\\1 {{ line_item }}\""
-  with_items:
-     - "tsx=on"
-  notify: __sap_hana_preconfigure_regenerate_grub2_conf_handler
+  command: /bin/true
+  notify: __sap_hana_preconfigure_grubby_update_handler
   when:
     - ansible_architecture == 'x86_64'
     - ansible_distribution == 'RedHat'
     - ansible_distribution_major_version == '8'
     - __sap_hana_preconfigure_fact_ansible_distribution_minor_version >= '3'
   tags: grubconfig
-  loop_control:
-    loop_var: line_item
diff --git a/vars/RedHat_8.yml b/vars/RedHat_8.yml
index 29efc7a..dd77300 100644
--- a/vars/RedHat_8.yml
+++ b/vars/RedHat_8.yml
@@ -135,6 +135,7 @@ __sap_hana_preconfigure_min_packages_8_3_x86_64:
 __sap_hana_preconfigure_min_packages_8_3_ppc64le:
 
 __sap_hana_preconfigure_min_packages_8_4_x86_64:
+  - [ 'kernel' , '4.18.0-305.3.1.el8_4' ]
 
 __sap_hana_preconfigure_min_packages_8_4_ppc64le: