fix(openeuler): correct Warewulf3 recipes and update SP4/COPR repos

- Rename openEuler 22.03 recipes from warewulf -> warewulf3 provisioner
- Update VNFS chroot template to SP4 repository URLs (was SP3)
- Update OpenHPC COPR repo target to openeuler-24.03_LTS_SP2
- Add virtio_pci before virtio_net in Warewulf3 bootstrap for VM support
- Abstract MariaDB/MySQL service name and config path per distro
- Abstract extra-repos package per distro (epel-release vs openEuler-release)
- Remove stale BOS_MIRROR comment and openeuler-extra-repos install step
- Add ChangeLog entries for 3.x

Co-authored-by: Claude <noreply@anthropic.com>
Signed-off-by: Timothy Middelkoop <tmiddelkoop@internet2.edu>

Author: middelkoopt

components/provisioning/warewulf-vnfs/SOURCES/openeuler-22.03.tmpl

@@ -18,11 +18,11 @@ if [ -z "$YUM_MIRROR" ]; then
     if [ -z "$YUM_MIRROR_BASE" ]; then
         YUM_MIRROR_BASE="http://repo.openeuler.org"
     fi
-    YUM_MIRROR="${YUM_MIRROR_BASE}/openEuler-22.03-LTS-SP3/OS/\$basearch/, \
-	${YUM_MIRROR_BASE}/openEuler-22.03-LTS-SP3/everything/\$basearch/, \
-	${YUM_MIRROR_BASE}/openEuler-22.03-LTS-SP3/EPOL/main/\$basearch/, \
-        ${YUM_MIRROR_BASE}/openEuler-22.03-LTS-SP3/EPOL/update/main/\$basearch/, \
-	${YUM_MIRROR_BASE}/openEuler-22.03-LTS-SP3/update/\$basearch/"
+    YUM_MIRROR="${YUM_MIRROR_BASE}/openEuler-22.03-LTS-SP4/OS/\$basearch/, \
+	${YUM_MIRROR_BASE}/openEuler-22.03-LTS-SP4/everything/\$basearch/, \
+	${YUM_MIRROR_BASE}/openEuler-22.03-LTS-SP4/EPOL/main/\$basearch/, \
+        ${YUM_MIRROR_BASE}/openEuler-22.03-LTS-SP4/EPOL/update/main/\$basearch/, \
+	${YUM_MIRROR_BASE}/openEuler-22.03-LTS-SP4/update/\$basearch/"
 fi
 
 # Install only what is necessary/specific for this distribution

docs/ChangeLog

@@ -1,5 +1,19 @@
 # -*- mode: sh; fill-column: 120; -*-
 
+Version 3.x (unreleased)
+
+[General Updates]
+
+  * openEuler 22.03 Warewulf3 recipes corrected to use warewulf3 provisioner (previously referenced warewulf4 config)
+  * Updated openEuler 22.03 VNFS chroot template to use SP4 repository URLs (previously SP3)
+  * Updated OpenHPC COPR repository reference for openEuler 22.03 recipes to openeuler-24.03_LTS_SP2 build target
+  * Warewulf3 bootstrap now loads virtio_pci before virtio_net to ensure the PCI bus driver is present for VM guests
+  * Warewulf3 compute image setup generalized to support distro-specific MariaDB/MySQL service and config file names
+    (openEuler 22.03 uses mysqld/mysql-server.cnf rather than mariadb/mariadb-server.cnf)
+  * Warewulf3 chroot extra-repos package now config-driven per distro (epel-release for EL9, openEuler-release for openEuler)
+
+----------------------------------------------------------------------------------------------------------------------
+
 Version 3.0 (15 September 2023)
 
 [Important Highlights/Notices for 3.x series]

docs/install/config/distro/el9.yaml

@@ -23,3 +23,6 @@ pkg_remove: "dnf -y remove"
 pkg_upgrade: "dnf -y upgrade"
 pkg_upgrade_chroot: 'dnf -y --installroot="$CHROOT" upgrade'
 pkg_tftp: "syslinux-tftpboot"
+mariadb_cnf: "/etc/my.cnf.d/mariadb-server.cnf"
+mariadb_service: "mariadb"
+extra_repos_pkg: "epel-release"

docs/install/config/distro/openeuler22.03.yaml

@@ -30,11 +30,11 @@ pkg_remove: "dnf -y remove"
 pkg_upgrade: "dnf -y upgrade"
 pkg_upgrade_chroot: 'dnf -y --installroot="$CHROOT" upgrade'
 pkg_tftp: "syslinux-tftpboot"
-
-# External repository URLs
-beegfs_repo: "https://www.beegfs.io/release/beegfs_7.4.5/dists/beegfs-rhel9.repo"
+mariadb_cnf: "/etc/my.cnf.d/mysql-server.cnf"
+mariadb_service: "mysqld"
+extra_repos_pkg: "openEuler-release"
 
 # openEuler-specific OHPC repo (COPR for compute image)
 openeuler_ohpc_repo_server: "https://eur.openeuler.openatom.cn"
-openeuler_ohpc_repo_dir: "coprs/openhpc/OpenHPC/repo/openeuler-22.03_LTS_SP4"
-openeuler_ohpc_repo_file: "openhpc-OpenHPC-openeuler-22.03_LTS_SP4.repo"
+openeuler_ohpc_repo_dir: "coprs/openhpc/OpenHPC/repo/openeuler-24.03_LTS_SP2"
+openeuler_ohpc_repo_file: "openhpc-OpenHPC-openeuler-24.03_LTS_SP2.repo"

…euler22.03-aarch64-warewulf-openpbs.conf …uler22.03-aarch64-warewulf3-openpbs.confdocs/install/recipes/openeuler22.03-aarch64-warewulf-openpbs.conf renamed to docs/install/recipes/openeuler22.03-aarch64-warewulf3-openpbs.conf docs/install/recipes/openeuler22.03-aarch64-warewulf-openpbs.conf renamed to docs/install/recipes/openeuler22.03-aarch64-warewulf3-openpbs.conf

@@ -1,5 +1,5 @@
 config/base.yaml
 config/distro/openeuler22.03.yaml
 config/arch/aarch64.yaml
-config/provisioner/warewulf.yaml
+config/provisioner/warewulf3.yaml
 config/scheduler/openpbs.yaml

…eneuler22.03-aarch64-warewulf-slurm.conf …neuler22.03-aarch64-warewulf3-slurm.confdocs/install/recipes/openeuler22.03-aarch64-warewulf-slurm.conf renamed to docs/install/recipes/openeuler22.03-aarch64-warewulf3-slurm.conf docs/install/recipes/openeuler22.03-aarch64-warewulf-slurm.conf renamed to docs/install/recipes/openeuler22.03-aarch64-warewulf3-slurm.conf

@@ -1,5 +1,5 @@
 config/base.yaml
 config/distro/openeuler22.03.yaml
 config/arch/aarch64.yaml
-config/provisioner/warewulf.yaml
+config/provisioner/warewulf3.yaml
 config/scheduler/slurm.yaml

…neuler22.03-x86_64-warewulf-openpbs.conf …euler22.03-x86_64-warewulf3-openpbs.confdocs/install/recipes/openeuler22.03-x86_64-warewulf-openpbs.conf renamed to docs/install/recipes/openeuler22.03-x86_64-warewulf3-openpbs.conf docs/install/recipes/openeuler22.03-x86_64-warewulf-openpbs.conf renamed to docs/install/recipes/openeuler22.03-x86_64-warewulf3-openpbs.conf

@@ -1,5 +1,5 @@
 config/base.yaml
 config/distro/openeuler22.03.yaml
 config/arch/x86_64.yaml
-config/provisioner/warewulf.yaml
+config/provisioner/warewulf3.yaml
 config/scheduler/openpbs.yaml

…peneuler22.03-x86_64-warewulf-slurm.conf …eneuler22.03-x86_64-warewulf3-slurm.confdocs/install/recipes/openeuler22.03-x86_64-warewulf-slurm.conf renamed to docs/install/recipes/openeuler22.03-x86_64-warewulf3-slurm.conf docs/install/recipes/openeuler22.03-x86_64-warewulf-slurm.conf renamed to docs/install/recipes/openeuler22.03-x86_64-warewulf3-slurm.conf

@@ -1,5 +1,5 @@
 config/base.yaml
 config/distro/openeuler22.03.yaml
 config/arch/x86_64.yaml
-config/provisioner/warewulf.yaml
+config/provisioner/warewulf3.yaml
 config/scheduler/slurm.yaml

docs/install/templates/distro/openeuler/repos.md.j2

@@ -1,10 +1,9 @@
 In addition to the OpenHPC package repository, the *head node* also requires
 access to the standard base OS distro repositories in order to resolve necessary
-dependencies. For {{ distro_full_name }}, the requirements are to have access to
-the OS, Everything, EPOL main, and EPOL update repositories. Note that the OS,
-Everything, and EPOL main repositories are typically enabled by default. To
-enable the EPOL update repository on {{ distro_full_name }}, you can run the
-following command:
+dependencies. For openEuler, the requirements are to have access to
+the OS, Everything, EPOL main, and update repositories. These are all enabled by
+default on openEuler.  We now enable the OpenEuler OpenHPC repo (Note: these are 
+from openEuler 24.03).
 
 <!-- ohpc_begin -->
 <!-- ohpc_comment Install EPOL -->
@@ -13,7 +12,6 @@ following command:
 {{ pkg_add_repo }} {{ openeuler_ohpc_repo_server }}\
 /{{ openeuler_ohpc_repo_dir }}\
 /{{ openeuler_ohpc_repo_file }}
-{{ pkg_install }} openeuler-extra-repos
 ```
 <!-- ohpc_end -->
 

docs/install/templates/provisioner/warewulf3/compute-create-image.md.j2

@@ -16,8 +16,8 @@ of the compute node. The default location for this example is
 ::: {.tip}
 Warewulf is configured by default to access an external repository during the
 `wwmkchroot` process. If the head node cannot reach the public {{ distro_full_name }}
-mirrors, set the `${BOS_MIRROR}` environment variable to your desired repo
-location prior to running `wwmkchroot`.
+mirrors, set the `YUM_MIRROR_BASE` environment variable to your desired mirror
+base URL prior to running `wwmkchroot`.
 :::
 
 <!-- ohpc_begin -->
@@ -40,14 +40,11 @@ cp -p /etc/zypp/repos.d/OpenHPC*.repo $CHROOT/etc/zypp/repos.d
 # Import GPG keys for chroot repository usage
 zypper -n --root $CHROOT --no-gpg-checks --gpg-auto-import-keys refresh
 {% else %}
-# Override default OS repository (optional) - set BOS_MIRROR to desired repo
-# export YUM_MIRROR=${BOS_MIRROR}
-
 # Build initial chroot image
 wwmkchroot -v {{ baseos }} $CHROOT
 
-# Enable OpenHPC and EPEL repos inside chroot
-{{ pkg_install_chroot }} epel-release
+# Enable OpenHPC and distro repos inside chroot
+{{ pkg_install_chroot }} {{ extra_repos_pkg }}
 cp -p /etc/yum.repos.d/OpenHPC*.repo $CHROOT/etc/yum.repos.d
 {% endif %}
 ```