many: HMS-10300 prepare splitting of imagetypes.yaml

data/distrodefs/fedora.yaml

@@ -42,6 +42,17 @@ distros:
       # we will need to update two places which is clearly a regression from
       # before.
 
+    image_config:
+      default:
+        default_oscap_datastream: "/usr/share/xml/scap/ssg/content/ssg-fedora-ds.xml"
+        hostname: "localhost.localdomain"
+        install_weak_deps: true
+        locale: "C.UTF-8"
+        machine_id_uninitialized: true
+        timezone: "UTC"
+        default_kernel: "kernel-core"
+        update_default_kernel: true
+
   - &fedora_stable
     <<: *fedora_rawhide
     name: "fedora-{{.MajorVersion}}"

data/distrodefs/fedora/imagetypes.yaml

@@ -21,14 +21,6 @@
       - "smartmontools"
       - "smartmontools-selinux"
 
-  server_host_pkgset: &server_host_pkgset
-    include:
-      - "@container-management"
-      - "@server-hardware-support"
-      - "dracut-config-rescue"
-      - "kernel"
-      - "linux-firmware"
-
   cloud_core_pkgset: &cloud_core_pkgset
     include:
       - "@cloud-server-environment"
@@ -304,8 +296,6 @@
     - "cloud-init-local.service"
 
   kernel_options:
-    default_kernel_optons:
-      - "ro"
     generic_kernel_options: &generic_kernel_options
       - "no_timer_check"
       - "console=tty1"
@@ -470,36 +460,6 @@
           - "grub2-ppc64le"
           - "grub2-ppc64le-modules"
       bootloader: "grub2"
-    ppc64le_installer_platform: &ppc64le_installer_platform
-      <<: *ppc64le_bios_platform
-      image_format: "qcow2"
-      packages:
-        <<: *ppc64le_bios_platform_packages
-        booting:
-          - "lsvpd"
-          - "ppc64-diag"
-          - "grub2-tools"
-          - "grub2-tools-minimal"
-          - "grub2-tools-extra"
-        firmware:
-          - "amd-gpu-firmware"
-          - "atheros-firmware"
-          - "atmel-firmware"
-          - "b43-openfwwf"
-          - "brcmfmac-firmware"
-          - "intel-gpu-firmware"
-          - "iwlegacy-firmware"
-          - "iwlwifi-dvm-firmware"
-          - "iwlwifi-mvm-firmware"
-          - "libertas-firmware"
-          - "linux-firmware"
-          - "mt7xxx-firmware"
-          - "nvidia-gpu-firmware"
-          - "nxpwireless-firmware"
-          - "qed-firmware"
-          - "realtek-firmware"
-          - "tiwilink-firmware"
-          - "zd1211-firmware"
     s390x_zipl_platform: &s390x_zipl_platform
       arch: "s390x"
       zipl_support: true
@@ -637,7 +597,6 @@
       - &root_partition_guid_x86_64 "4f68bce3-e8cd-4db1-96e7-fbcaf984b709"
       - &root_partition_guid_aarch64 "b921b045-1df0-41c3-af44-4c6f280d3fae"
       - &root_partition_guid_ppc64le "c31c45e6-3f39-412e-80fb-4809c4980599"
-      - &root_partition_guid_s390x "5eead9a9-fe09-4a1e-a1d7-520d00531306"
 
     # the invidual partitions for easier composibility
     partitions:
@@ -1260,17 +1219,6 @@
     blueprint:
       supported_options: *supported_options_ostree_disk
 
-image_config:
-  default:
-    default_oscap_datastream: "/usr/share/xml/scap/ssg/content/ssg-fedora-ds.xml"
-    hostname: "localhost.localdomain"
-    install_weak_deps: true
-    locale: "C.UTF-8"
-    machine_id_uninitialized: true
-    timezone: "UTC"
-    default_kernel: "kernel-core"
-    update_default_kernel: true
-
 image_types:
   "generic-vagrant-libvirt": &generic_vagrant_libvirt
     filename: "vagrant-libvirt.box"

data/distrodefs/rhel-10/imagetypes.yaml

@@ -869,25 +869,6 @@
       - "customizations.timezone"
 
 
-image_config:
-  default:
-    default_kernel: "kernel"
-    default_oscap_datastream: "/usr/share/xml/scap/ssg/content/ssg-rhel10-ds.xml"
-    install_weak_deps: true
-    locale: "C.UTF-8"
-    permissive_rhc: true
-    sysconfig:
-      networking: true
-      no_zero_conf: true
-    timezone: "UTC"
-    update_default_kernel: true
-  conditions:
-    "centos oscap datastream path":
-      when:
-        distro_name: "centos"
-      shallow_merge:
-        default_oscap_datastream: "/usr/share/xml/scap/ssg/content/ssg-cs10-ds.xml"
-
 image_types:
   # XXX: not a real pkgset but the "os" pipeline pkgset for image-installer
   # find a nicer way to represent this

data/distrodefs/rhel-7/imagetypes.yaml

@@ -236,23 +236,6 @@
       - "customizations.timezone"
       - "customizations.sshd"
 
-image_config:
-  default:
-    timezone: "America/New_York"
-    locale: "en_US.UTF-8"
-    gpgkey_files:
-      - "/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release"
-    sysconfig:
-      networking: true
-      no_zero_conf: true
-      create_default_network_scripts: true
-    default_kernel: "kernel"
-    update_default_kernel: true
-    kernel_options_bootloader: true
-    # RHEL 7 grub does not support BLS
-    no_bls: true
-    install_weak_deps: true
-
 image_types:
   "azure-rhui":
     filename: "disk.vhd.xz"

data/distrodefs/rhel-8/imagetypes.yaml

@@ -1331,26 +1331,6 @@
       ref: &ostree_edge_ref "{{.Distro.Name}}/{{.Distro.MajorVersion}}/{{.Arch}}/edge"
 
 
-image_config:
-  default:
-    default_kernel: "kernel"
-    default_oscap_datastream: "/usr/share/xml/scap/ssg/content/ssg-rhel8-ds.xml"
-    install_weak_deps: true
-    kernel_options_bootloader: true
-    locale: "en_US.UTF-8"
-    permissive_rhc: false
-    sysconfig:
-      networking: true
-      no_zero_conf: true
-    timezone: "America/New_York"
-    update_default_kernel: true
-  conditions:
-    "centos has a different oscap path":
-      when:
-        distro_name: "centos"
-      shallow_merge:
-        default_oscap_datastream: "/usr/share/xml/scap/ssg/content/ssg-centos8-ds.xml"
-
 image_types:
   # XXX: not a real pkgset but the "os" pipeline pkgset for image-installer
   # find a nicer way to represent this

data/distrodefs/rhel-9/imagetypes.yaml

@@ -1344,25 +1344,6 @@
       remote_name: "rhel-edge"
       ref: &ostree_edge_ref "{{.Distro.Name}}/{{.Distro.MajorVersion}}/{{.Arch}}/edge"
 
-image_config:
-  default:
-    default_kernel: "kernel"
-    default_oscap_datastream: "/usr/share/xml/scap/ssg/content/ssg-rhel9-ds.xml"
-    install_weak_deps: true
-    locale: "C.UTF-8"
-    permissive_rhc: true
-    sysconfig:
-      networking: true
-      no_zero_conf: true
-    timezone: "America/New_York"
-    update_default_kernel: true
-  conditions:
-    "oscap needs a differnt path on centos":
-      when:
-        distro_name: "centos"
-      shallow_merge:
-        default_oscap_datastream: "/usr/share/xml/scap/ssg/content/ssg-cs9-ds.xml"
-
 image_types:
   # XXX: not a real pkgset but the "os" pipeline pkgset for image-installer
   # find a nicer way to represent this

data/distrodefs/rhel.yaml

@@ -70,6 +70,24 @@ distros:
       aarch64: "registry.access.redhat.com/ubi{{.MajorVersion}}/ubi:latest"
       ppc64le: "registry.access.redhat.com/ubi{{.MajorVersion}}/ubi:latest"
       s390x: "registry.access.redhat.com/ubi{{.MajorVersion}}/ubi:latest"
+    image_config:
+      default:
+        default_kernel: "kernel"
+        default_oscap_datastream: "/usr/share/xml/scap/ssg/content/ssg-rhel10-ds.xml"
+        install_weak_deps: true
+        locale: "C.UTF-8"
+        permissive_rhc: true
+        sysconfig:
+          networking: true
+          no_zero_conf: true
+        timezone: "UTC"
+        update_default_kernel: true
+      conditions:
+        "centos oscap datastream path":
+          when:
+            distro_name: "centos"
+          shallow_merge:
+            default_oscap_datastream: "/usr/share/xml/scap/ssg/content/ssg-cs10-ds.xml"
 
   - <<: *rhel10
     name: "almalinux-{{.MajorVersion}}.{{.MinorVersion}}"
@@ -199,6 +217,25 @@ distros:
       ppc64le: "registry.access.redhat.com/ubi{{.MajorVersion}}/ubi:latest"
       s390x: "registry.access.redhat.com/ubi{{.MajorVersion}}/ubi:latest"
 
+    image_config:
+      default:
+        default_kernel: "kernel"
+        default_oscap_datastream: "/usr/share/xml/scap/ssg/content/ssg-rhel9-ds.xml"
+        install_weak_deps: true
+        locale: "C.UTF-8"
+        permissive_rhc: true
+        sysconfig:
+          networking: true
+          no_zero_conf: true
+        timezone: "America/New_York"
+        update_default_kernel: true
+      conditions:
+        "oscap needs a differnt path on centos":
+          when:
+            distro_name: "centos"
+          shallow_merge:
+            default_oscap_datastream: "/usr/share/xml/scap/ssg/content/ssg-cs9-ds.xml"
+
   - <<: *rhel9
     name: "almalinux-{{.MajorVersion}}.{{.MinorVersion}}"
     match: 'almalinux-9\.[0-9]{1,2}'
@@ -314,6 +351,26 @@ distros:
       ppc64le: "registry.access.redhat.com/ubi{{.MajorVersion}}/ubi:latest"
       s390x: "registry.access.redhat.com/ubi{{.MajorVersion}}/ubi:latest"
 
+    image_config:
+      default:
+        default_kernel: "kernel"
+        default_oscap_datastream: "/usr/share/xml/scap/ssg/content/ssg-rhel8-ds.xml"
+        install_weak_deps: true
+        kernel_options_bootloader: true
+        locale: "en_US.UTF-8"
+        permissive_rhc: false
+        sysconfig:
+          networking: true
+          no_zero_conf: true
+        timezone: "America/New_York"
+        update_default_kernel: true
+      conditions:
+        "centos has a different oscap path":
+          when:
+            distro_name: "centos"
+          shallow_merge:
+            default_oscap_datastream: "/usr/share/xml/scap/ssg/content/ssg-centos8-ds.xml"
+
   - <<: *rhel8
     name: "almalinux-{{.MajorVersion}}.{{.MinorVersion}}"
     match: 'almalinux-8\.[0-9]{1,2}'
@@ -373,6 +430,22 @@ distros:
       x86_64: "registry.access.redhat.com/ubi{{.MajorVersion}}/ubi:latest"
       ppc64le: "registry.access.redhat.com/ubi{{.MajorVersion}}/ubi:latest"
       s390x: "registry.access.redhat.com/ubi{{.MajorVersion}}/ubi:latest"
+    image_config:
+      default:
+        timezone: "America/New_York"
+        locale: "en_US.UTF-8"
+        gpgkey_files:
+          - "/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release"
+        sysconfig:
+          networking: true
+          no_zero_conf: true
+          create_default_network_scripts: true
+        default_kernel: "kernel"
+        update_default_kernel: true
+        kernel_options_bootloader: true
+        # RHEL 7 grub does not support BLS
+        no_bls: true
+        install_weak_deps: true
 
   # Note that this will not be visible by default because we do not
   # ship with a reporegistry that contains repositories for it. It