From 90d3e93109b34f4bcdbc04f6fdd600e12f978d25 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 1 Feb 2021 17:46:35 +0900
Subject: [PATCH] [Rocky and before] Do not load nf_conntrack_proto_sctp

nf_conntrack_proto_sctp no longer exists since CentOS/RHEL 7.4, so we
should not load that module expicitly.

Change-Id: I3957ce3a4916e0f1455fdda38c0a35b8ffd508f7
Closes-Bug: #1914017
---
 puppet/services/kernel.yaml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/puppet/services/kernel.yaml b/puppet/services/kernel.yaml
index 9111813167..fe767d800f 100644
--- a/puppet/services/kernel.yaml
+++ b/puppet/services/kernel.yaml
@@ -145,7 +145,6 @@ outputs:
           map_merge:
             - br_netfilter: {}
             - nf_conntrack: {}
-              nf_conntrack_proto_sctp: {}
             - {get_attr: [RoleParametersValue, value, extra_kernel_modules]}
         kernel_packages: {get_attr: [RoleParametersValue, value, extra_kernel_packages]}
         sysctl_settings:
@@ -235,3 +234,9 @@ outputs:
 
       step_config: |
         include ::tripleo::profile::base::kernel
+
+      update_tasks:
+        - name: Remove obsolete nf_conntrack_proto_sctp from /etc/modules-load.d/
+          file:
+            path: /etc/modules-load.d/nf_conntrack_proto_sctp.conf
+            state: absent