From 205957a8eb037808cadefcbf8297619a2fe48eac Mon Sep 17 00:00:00 2001 From: Lukas Bezdicka Date: Mon, 21 Sep 2020 21:20:39 +0200 Subject: [PATCH] [train-only] Ensure obsolete module nf_conntrack_proto_sctp is not loaded We need to remove /etc/modules-load.d/nf_conntrack_proto_sctp.conf before rebooting the nodes. This is workaround for change that was imported into stable/queens(OSP13) by updating puppet module kmod. It's better if we fix it this way instead of fixing the older release. Resolves: rhbz#1880979 Change-Id: Idd8691facd58293d6273eabb35bc87827a011287 --- .../tripleo-packages/tripleo-packages-baremetal-puppet.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml index fd131d182f..f4f2b4dafe 100644 --- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml +++ b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml @@ -239,6 +239,10 @@ outputs: - '' - - "#!/bin/bash\n\n" - {get_param: LeappInitCommand} + - 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 - name: "add packages into Leapp's to_remove file" vars: pkg_to_remove: { get_param: UpgradeLeappToRemove }