Merge pull request #42 from danwinship/no-conntrack

NO-JIRA: Drop conntrack-tools

Author: openshift-merge-bot[bot]

common.yaml

@@ -208,13 +208,6 @@ postprocess:
         grep sudo /usr/lib/group >> /etc/group
     fi
 
-  # Remove the systemd unit; we only want the binary to be used
-  # by MCD or kubelet.  See below.
-  - |
-    #!/usr/bin/env bash
-    set -xeuo pipefail
-    rm /usr/lib/systemd/system/conntrackd.service
-
   # Delete documentation.
   - |
     #!/usr/bin/env bash
@@ -307,10 +300,6 @@ 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
  # Upstream PR https://github.com/coreos/fedora-coreos-config/pull/786
  - WALinuxAgent-udev
  # Provide fips-mode-setup which is needed by rhcos-fips.sh