coreos · cgwalters · Sep 15, 2023 · Sep 15, 2023
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "sagano"]
+	path = sagano
+	url = https://gitlab.com/CentOS/cloud/sagano
diff --git a/manifests/bootable-rpm-ostree.yaml b/manifests/bootable-rpm-ostree.yaml
diff --git a/manifests/bootable-rpm-ostree.yaml b/manifests/bootable-rpm-ostree.yaml
@@ -0,0 +1 @@
+../sagano/tier-1/bootable-rpm-ostree.yaml
diff --git a/manifests/bootupd.yaml b/manifests/bootupd.yaml
diff --git a/manifests/bootupd.yaml b/manifests/bootupd.yaml
@@ -0,0 +1 @@
+../sagano/tier-0/bootupd.yaml
diff --git a/manifests/fedora-coreos-base.yaml b/manifests/fedora-coreos-base.yaml
@@ -3,6 +3,8 @@
 # core functionality.
 
 include:
+  - kernel.yaml
+  - firmware.yaml
   - system-configuration.yaml
   - ignition-and-ostree.yaml
   - file-transfer.yaml

diff --git a/manifests/fedora-coreos.yaml b/manifests/fedora-coreos.yaml
@@ -20,9 +20,6 @@ conditional-include:
   - if: basearch == "aarch64"
     # Fixup for kdump on aarch64 AWS instances
     include: kdump-aarch64-aws-workaround.yaml
-  - if: basearch != "s390x"
-    # And remove some cruft from grub2
-    include: grub2-removals.yaml
   - if: basearch == "ppc64le"
     # Need OSTree autopruning on ppc64le (because kernels aren't compressed)
     # until we increase the size of /boot.

diff --git a/manifests/firmware.yaml b/manifests/firmware.yaml
@@ -0,0 +1 @@
+../sagano/tier-1/firmware.yaml
diff --git a/manifests/grub2-removals.yaml b/manifests/grub2-removals.yaml
diff --git a/manifests/grub2-removals.yaml b/manifests/grub2-removals.yaml
@@ -0,0 +1 @@
+../sagano/tier-0/grub2-removals.yaml
diff --git a/sagano b/sagano