Skip to content

Commit 5b76de5

Browse files
Merge pull request coreos#42 from danwinship/no-conntrack
NO-JIRA: Drop conntrack-tools
2 parents ad54e01 + 242ea20 commit 5b76de5

File tree

2 files changed

+0
-27
lines changed

2 files changed

+0
-27
lines changed

common.yaml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -208,13 +208,6 @@ postprocess:
208208
grep sudo /usr/lib/group >> /etc/group
209209
fi
210210
211-
# Remove the systemd unit; we only want the binary to be used
212-
# by MCD or kubelet. See below.
213-
- |
214-
#!/usr/bin/env bash
215-
set -xeuo pipefail
216-
rm /usr/lib/systemd/system/conntrackd.service
217-
218211
# Delete documentation.
219212
- |
220213
#!/usr/bin/env bash
@@ -307,10 +300,6 @@ packages:
307300
# https://bugzilla.redhat.com/show_bug.cgi?id=1877905
308301
# https://bugzilla.redhat.com/show_bug.cgi?id=1886201
309302
- perl-interpreter
310-
# https://github.com/coreos/fedora-coreos-tracker/issues/404
311-
# https://bugzilla.redhat.com/show_bug.cgi?id=1925698
312-
# https://github.com/openshift/machine-config-operator/pull/2421
313-
- conntrack-tools
314303
# Upstream PR https://github.com/coreos/fedora-coreos-config/pull/786
315304
- WALinuxAgent-udev
316305
# Provide fips-mode-setup which is needed by rhcos-fips.sh

tests/kola/files/conntrack-tools

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)