Merge pull request #603 from jlebon/pr/modularity

manifest: adapt for rpm-ostree modularity support

extensions.yaml

@@ -6,6 +6,11 @@ repos:
   - rhel-8-advanced-virt
   - rhel-8-nfv
 
+modules:
+  enable:
+    # for qemu-kiwi
+    - virt:av
+
 extensions:
   # https://github.com/coreos/fedora-coreos-tracker/issues/326
   usbguard:

manifest.yaml

@@ -261,6 +261,28 @@ packages:
  # https://github.com/openshift/machine-config-operator/pull/2421
  - conntrack-tools
 
+repo-packages:
+  # we always want the kernel from BaseOS
+  - repo: rhel-8-baseos
+    packages:
+      - kernel
+  # we want the one shipping in RHEL, not the equivalently versioned one in RHAOS
+  - repo: rhel-8-appstream
+    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
+
+modules:
+  enable:
+    # podman stack
+    - container-tools:rhel8
+    # qemu-guest-agent
+    - virt:rhel
+
 packages-x86_64:
   # Temporary add of open-vm-tools. Should be removed when containerized
   - open-vm-tools

rhcos-packages.yaml

@@ -16,7 +16,6 @@ packages:
   - nss-altfiles
   - ostree
   - rpm-ostree
-  # part of container-tools module
   - toolbox
   # for kdump:
   # https://github.com/coreos/fedora-coreos-tracker/issues/622