From ed4f818dc546a5819fb2c47cc34af7ecfbba5905 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Wed, 14 Aug 2019 13:30:43 -0600
Subject: [PATCH] Add ExtraKernelPackages

Added new parameter naemd ExtraKernelPackages that can be used to
install specific packages prior to the kmod execution.

Change-Id: I505edc7f0391c67371881ce9e2d944f8608a091c
Depends-On: https://review.opendev.org/#/c/678092/
Closes-Bug: #1840180
(cherry picked from commit 85bb97423cd31b07380e14896a47f2b68d3a8bec)
---
 puppet/services/kernel.yaml                              | 9 +++++++++
 .../add-kernel-package-parameter-f3ad68ed4b72b0f5.yaml   | 6 ++++++
 2 files changed, 15 insertions(+)
 create mode 100644 releasenotes/notes/add-kernel-package-parameter-f3ad68ed4b72b0f5.yaml

diff --git a/puppet/services/kernel.yaml b/puppet/services/kernel.yaml
index 2c04087130..e70751a976 100644
--- a/puppet/services/kernel.yaml
+++ b/puppet/services/kernel.yaml
@@ -78,6 +78,12 @@ parameters:
     type: json
     tags:
       - role_specific
+  ExtraKernelPackages:
+    default: {}
+    description: List of extra kernel related packages to install.
+    type: json
+    tags:
+      - role_specific
   ExtraSysctlSettings:
     default: {}
     description: Hash of extra sysctl settings to apply.
@@ -99,10 +105,12 @@ resources:
         map_replace:
           - map_replace:
             - extra_kernel_modules: ExtraKernelModules
+              extra_kernel_packages: ExtraKernelPackages
               extra_sysctl_settings: ExtraSysctlSettings
             - values: {get_param: [RoleParameters]}
           - values:
               ExtraKernelModules: {get_param: ExtraKernelModules}
+              ExtraKernelPackages: {get_param: ExtraKernelPackages}
               ExtraSysctlSettings: {get_param: ExtraSysctlSettings}
 
 outputs:
@@ -121,6 +129,7 @@ outputs:
             - nf_conntrack: {}
               nf_conntrack_proto_sctp: {}
             - {get_attr: [RoleParametersValue, value, extra_kernel_modules]}
+        kernel_packages: {get_attr: [RoleParametersValue, value, extra_kernel_packages]}
         sysctl_settings:
           map_merge:
             - net.ipv4.tcp_keepalive_intvl:
diff --git a/releasenotes/notes/add-kernel-package-parameter-f3ad68ed4b72b0f5.yaml b/releasenotes/notes/add-kernel-package-parameter-f3ad68ed4b72b0f5.yaml
new file mode 100644
index 0000000000..acd840e6e2
--- /dev/null
+++ b/releasenotes/notes/add-kernel-package-parameter-f3ad68ed4b72b0f5.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Created a `ExtraKernelPackages` parameter to allow users to install
+    additional kernel related packages prior to loading the kernel modules
+    defined in `ExtraKernelModules`.