manifest: pull container-tools content from RHAOS repo

manifest.yaml

@@ -353,32 +353,24 @@ repo-packages:
       - nss-altfiles
   - repo: rhel-8-server-ose
     packages:
-      # eventually, we want the one from the container-tools module, but we're
-      # not there yet
-      - toolbox
-      # These are the only container stack packages we don't get from modularity
-      # nor from base RHEL for various reasons. See:
-      # https://github.com/openshift/os/pull/681#issuecomment-1022443830
-      #
-      # newer than what is included in RHEL 8.4.Z EUS, but addresses some BZs
-      # that customers were encountering
+      # Starting with 4.11, we are working with the Containers team to build
+      # certain container-tools RPMs in the RHAOS branches for RHCOS + RHEL
+      # worker nodes.
+      - conmon
       - container-selinux
-      # newer than what is included in RHEL 8.4.Z EUS, because the k8s folks
-      # wanted to start testing with 1.x versions of crun
+      - containernetworking-plugins
+      - containers-common
+      - criu
       - crun
-      # slightly newer than what is included in RHEL 8.4.Z EUS, because we had
-      # previously shipped a newer version in OCP/RHCOS 4.9 and had to preserve
-      # the upgrade path
+      - fuse-overlayfs
+      - podman
       - runc
-      # Need an updated skopeo for https://github.com/containers/skopeo/pull/1476
-      # for coreos layering work
-      - containers-common
       - skopeo
+      - slirp4netns
+      - toolbox
 
 modules:
   enable:
-    # podman stack; see https://github.com/openshift/os/pull/681#issuecomment-1022443830
-    - container-tools:rhel8
     # qemu-guest-agent
     - virt:rhel