From d046ef839997cbd1c068774385a02c38dc3f6d25 Mon Sep 17 00:00:00 2001
From: David Vallee Delisle <dvd@redhat.com>
Date: Thu, 2 Sep 2021 13:00:30 +0000
Subject: [PATCH] Revert "[train-only] Adding ForceNoTsx flag"

This reverts commit 7840da00144cabaa7dc911bdaa19621d10dee478.

Reason for revert: Since microcode update from Intel, this is useless.
https://access.redhat.com/articles/6101171
https://access.redhat.com/solutions/6036141

Change-Id: Ie5c7e29e4d716282a26528ebd19ae347f4601b4a
---
 .../kernel-boot-params-baremetal-ansible.yaml | 10 ----------
 .../add-forcenotsx-36fc6dce46518f5b.yaml      | 20 -------------------
 2 files changed, 30 deletions(-)
 delete mode 100644 releasenotes/notes/add-forcenotsx-36fc6dce46518f5b.yaml

diff --git a/deployment/kernel/kernel-boot-params-baremetal-ansible.yaml b/deployment/kernel/kernel-boot-params-baremetal-ansible.yaml
index 63ce1a2a71..c1a39e8f92 100644
--- a/deployment/kernel/kernel-boot-params-baremetal-ansible.yaml
+++ b/deployment/kernel/kernel-boot-params-baremetal-ansible.yaml
@@ -70,14 +70,6 @@ parameters:
     default: 900
     type: number
     description: Timeout in seconds to specify the wait time for ansible node reboot
-  ForceNoTsx:
-    default: false
-    description: >
-      This will disable the TSX flag validation in KernelArgs for this specific role.
-      More information available here: https://access.redhat.com/solutions/6036141
-    type: boolean
-    tags:
-      - role_specific
 
 resources:
   RoleParametersValue:
@@ -90,14 +82,12 @@ resources:
             - tuned_profile: TunedProfileName
               isolated_cores: IsolCpusList
               kernel_args: KernelArgs
-              force_no_tsx: ForceNoTsx
               kernel_args_defer_reboot: KernelArgsDeferReboot
             - values: {get_param: [RoleParameters]}
           - values:
               TunedProfileName: {get_param: TunedProfileName}
               IsolCpusList: {get_param: IsolCpusList}
               KernelArgs: {get_param: KernelArgs}
-              ForceNoTsx: {get_param: ForceNoTsx}
               KernelArgsDeferReboot: {get_param: KernelArgsDeferReboot}
 
 outputs:
diff --git a/releasenotes/notes/add-forcenotsx-36fc6dce46518f5b.yaml b/releasenotes/notes/add-forcenotsx-36fc6dce46518f5b.yaml
deleted file mode 100644
index 8664f463c1..0000000000
--- a/releasenotes/notes/add-forcenotsx-36fc6dce46518f5b.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-fixes:
-  - |
-    RHEL-8.3 kernel disabled the Intel TSX (Transactional
-    Synchronization Extensions) feature by default as a preemptive
-    security measure, but it breaks live migration from RHEL-7.9
-    (or even RHEL-8.1 or RHEL-8.2) to RHEL-8.3.
-
-    Operators are expected to explicitly define the TSX flag in
-    their KernelArgs for the compute role to prevent live-migration
-    issues during the upgrade or update process.
-
-    We now introduce this validation in tripleoclient to ensure
-    early failure.
-
-    The `ForceNoTsx` flag will disable this validation on a per-role
-    basis.
-
-    More information here:
-        https://access.redhat.com/solutions/6036141