Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

manifest: Add conntrack (tools) but without the daemon #502

Merged
merged 1 commit into from
Mar 10, 2021
Merged

manifest: Add conntrack (tools) but without the daemon #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,10 @@ packages:
# https://bugzilla.redhat.com/show_bug.cgi?id=1877905
# https://bugzilla.redhat.com/show_bug.cgi?id=1886201
- perl-interpreter
# https://github.com/coreos/fedora-coreos-tracker/issues/404
# https://bugzilla.redhat.com/show_bug.cgi?id=1925698
# https://github.com/openshift/machine-config-operator/pull/2421
- conntrack-tools

packages-x86_64:
# Temporary add of open-vm-tools. Should be removed when containerized
Expand Down Expand Up @@ -301,3 +305,7 @@ remove-from-packages:
- "/etc/NetworkManager/dispatcher.d/11-dhclient"
- "/usr/lib/NetworkManager/dispatcher.d/11-dhclient"
- "/usr/lib64/pm-utils/sleep.d/56dhclient"
# Remove the systemd unit; we only want the binary to be used
# by MCD or kubelet. See above.
- - conntrack-tools
- /usr/lib/systemd/system
3 changes: 3 additions & 0 deletions tests/kola/misc-ro/misc-ro.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,9 @@ if ! test -f /etc/iscsi/initiatorname.iscsi; then
fi
echo "ok iSCSI initiator name"

rpm -q conntrack-tools
test ! -f /usr/lib/systemd/system/conntrackd.service
echo "ok conntrack tools without daemon"

# Let's make sure the NetworkManager we use is one of the one-off
# rebuilds while we're following RHEL 8.3.
Expand Down