From cd5c95441cc56e7ab3f7f4cc1d558fce5bb98d99 Mon Sep 17 00:00:00 2001
From: Haresh Khandelwal <hakhande@redhat.com>
Date: Wed, 6 Oct 2021 18:51:50 +0530
Subject: [PATCH] add kernel-modules-extra in overcloud image needed for HWOL

In case of ovs-hw-offload, without k-m-e installed,
it will have a performance impact because of excessive upcalls
due to the lack of act_ct.

This patch is intended to provision k-m-e in overcloud image
building.

act_ct would be added to kernel-core in rhel9.
So, k-m-e doesnt required in rhel9,centos9.

Closes-Bug: #1946227
Change-Id: If398172876059559ce70ebb868ada82da009a02d
---
 image-yaml/overcloud-hardened-images-centos8.yaml      | 2 ++
 image-yaml/overcloud-hardened-images-rhel8.yaml        | 1 +
 image-yaml/overcloud-hardened-images-uefi-centos8.yaml | 4 +++-
 image-yaml/overcloud-hardened-images-uefi-rhel8.yaml   | 3 ++-
 image-yaml/overcloud-images-centos8.yaml               | 2 ++
 image-yaml/overcloud-images-rhel8.yaml                 | 1 +
 6 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/image-yaml/overcloud-hardened-images-centos8.yaml b/image-yaml/overcloud-hardened-images-centos8.yaml
index 81a224635..e9fdbd0b4 100644
--- a/image-yaml/overcloud-hardened-images-centos8.yaml
+++ b/image-yaml/overcloud-hardened-images-centos8.yaml
@@ -8,3 +8,5 @@ disk_images:
     elements:
       - selinux-permissive
       - interface-names
+    packages:
+      - kernel-modules-extra
diff --git a/image-yaml/overcloud-hardened-images-rhel8.yaml b/image-yaml/overcloud-hardened-images-rhel8.yaml
index 1fd7737cb..f3d6547fb 100644
--- a/image-yaml/overcloud-hardened-images-rhel8.yaml
+++ b/image-yaml/overcloud-hardened-images-rhel8.yaml
@@ -9,3 +9,4 @@ disk_images:
       - interface-names
     packages:
       - rhosp-release
+      - kernel-modules-extra
diff --git a/image-yaml/overcloud-hardened-images-uefi-centos8.yaml b/image-yaml/overcloud-hardened-images-uefi-centos8.yaml
index 7d3840a48..bf9fa3977 100644
--- a/image-yaml/overcloud-hardened-images-uefi-centos8.yaml
+++ b/image-yaml/overcloud-hardened-images-uefi-centos8.yaml
@@ -7,6 +7,8 @@ disk_images:
     elements:
       - selinux-permissive
       - interface-names
+    packages:
+      - kernel-modules-extra
   -
     imagename: ironic-python-agent
     type: qcow2
@@ -14,4 +16,4 @@ disk_images:
     release: 8
     elements:
       - selinux-permissive
-      - interface-names
\ No newline at end of file
+      - interface-names
diff --git a/image-yaml/overcloud-hardened-images-uefi-rhel8.yaml b/image-yaml/overcloud-hardened-images-uefi-rhel8.yaml
index 4b21a131b..522536f92 100644
--- a/image-yaml/overcloud-hardened-images-uefi-rhel8.yaml
+++ b/image-yaml/overcloud-hardened-images-uefi-rhel8.yaml
@@ -8,6 +8,7 @@ disk_images:
       - interface-names
     packages:
       - rhosp-release
+      - kernel-modules-extra
   -
     imagename: ironic-python-agent
     type: qcow2
@@ -15,4 +16,4 @@ disk_images:
     release: 8
     elements:
       - selinux-permissive
-      - interface-names
\ No newline at end of file
+      - interface-names
diff --git a/image-yaml/overcloud-images-centos8.yaml b/image-yaml/overcloud-images-centos8.yaml
index 61be6dd86..707148511 100644
--- a/image-yaml/overcloud-images-centos8.yaml
+++ b/image-yaml/overcloud-images-centos8.yaml
@@ -7,6 +7,8 @@ disk_images:
     elements:
       - selinux-permissive
       - interface-names
+    packages:
+      - kernel-modules-extra
     environment:
       FS_TYPE: xfs
     options:
diff --git a/image-yaml/overcloud-images-rhel8.yaml b/image-yaml/overcloud-images-rhel8.yaml
index 9a3bb3196..040aba48b 100644
--- a/image-yaml/overcloud-images-rhel8.yaml
+++ b/image-yaml/overcloud-images-rhel8.yaml
@@ -9,6 +9,7 @@ disk_images:
       - interface-names
     packages:
       - rhosp-release
+      - kernel-modules-extra
     environment:
       FS_TYPE: xfs
     options: