From dc35d5ab168c60b3dce9d7dcdce4ca698ee155db Mon Sep 17 00:00:00 2001 From: Timothy Middelkoop Date: Wed, 29 Apr 2026 20:27:10 -0500 Subject: [PATCH 1/3] Confluent updates backported from 3.x Signed-off-by: Timothy Middelkoop --- .../almalinux10-aarch64-confluent-slurm.yaml | 3 +-- .../almalinux10-x86_64-confluent-slurm.yaml | 3 +-- .../rocky10-aarch64-confluent-slurm.yaml | 3 +-- .../recipes/rocky10-x86_64-confluent-slurm.yaml | 3 +-- .../provisioner/confluent/add-nodes.md.j2 | 2 +- .../provisioner/confluent/init-os-images.md.j2 | 17 +++++++++++------ .../provisioner/confluent/post-add-user.md.j2 | 4 ++-- 7 files changed, 18 insertions(+), 17 deletions(-) diff --git a/docs/install/recipes/almalinux10-aarch64-confluent-slurm.yaml b/docs/install/recipes/almalinux10-aarch64-confluent-slurm.yaml index 400562b1f1..a4a7a76743 100644 --- a/docs/install/recipes/almalinux10-aarch64-confluent-slurm.yaml +++ b/docs/install/recipes/almalinux10-aarch64-confluent-slurm.yaml @@ -1,2 +1 @@ -distro_id: "alma-10.1-aarch64-default" -distro_iso_image: "AlmaLinux-10.1-aarch64-dvd.iso" +distro_iso_image: "AlmaLinux-10-latest-aarch64-dvd.iso" diff --git a/docs/install/recipes/almalinux10-x86_64-confluent-slurm.yaml b/docs/install/recipes/almalinux10-x86_64-confluent-slurm.yaml index 333e4e084b..f663a327fb 100644 --- a/docs/install/recipes/almalinux10-x86_64-confluent-slurm.yaml +++ b/docs/install/recipes/almalinux10-x86_64-confluent-slurm.yaml @@ -1,2 +1 @@ -distro_id: "alma-10.1-x86_64-default" -distro_iso_image: "AlmaLinux-10.1-x86_64-dvd.iso" +distro_iso_image: "AlmaLinux-10-latest-x86_64-dvd.iso" diff --git a/docs/install/recipes/rocky10-aarch64-confluent-slurm.yaml b/docs/install/recipes/rocky10-aarch64-confluent-slurm.yaml index 528d61924b..10228bdbbb 100644 --- a/docs/install/recipes/rocky10-aarch64-confluent-slurm.yaml +++ b/docs/install/recipes/rocky10-aarch64-confluent-slurm.yaml @@ -1,2 +1 @@ -distro_id: "rocky-10.1-aarch64-default" -distro_iso_image: "Rocky-10.1-aarch64-dvd1.iso" +distro_iso_image: "Rocky-10-latest-aarch64-dvd.iso" diff --git a/docs/install/recipes/rocky10-x86_64-confluent-slurm.yaml b/docs/install/recipes/rocky10-x86_64-confluent-slurm.yaml index 77fa6887a0..c209a9fb17 100644 --- a/docs/install/recipes/rocky10-x86_64-confluent-slurm.yaml +++ b/docs/install/recipes/rocky10-x86_64-confluent-slurm.yaml @@ -1,2 +1 @@ -distro_id: "rocky-10.1-x86_64-default" -distro_iso_image: "Rocky-10.1-x86_64-dvd1.iso" +distro_iso_image: "Rocky-10-latest-x86_64-dvd.iso" diff --git a/docs/install/templates/provisioner/confluent/add-nodes.md.j2 b/docs/install/templates/provisioner/confluent/add-nodes.md.j2 index d8f7926770..5cf3e356c6 100644 --- a/docs/install/templates/provisioner/confluent/add-nodes.md.j2 +++ b/docs/install/templates/provisioner/confluent/add-nodes.md.j2 @@ -73,6 +73,6 @@ network services like DNS and DHCP. These tasks are accomplished as follows: ```bash # Associate desired provisioning image for computes -nodedeploy -n compute -p {{ distro_id }} +nodedeploy -n compute -p ${distro_id} ``` diff --git a/docs/install/templates/provisioner/confluent/init-os-images.md.j2 b/docs/install/templates/provisioner/confluent/init-os-images.md.j2 index 3601b188a5..513e065372 100644 --- a/docs/install/templates/provisioner/confluent/init-os-images.md.j2 +++ b/docs/install/templates/provisioner/confluent/init-os-images.md.j2 @@ -18,7 +18,10 @@ initialize -i` ```bash osdeploy initialize -${initialize_options:-usklpta} -osdeploy import ${iso_path:-{{ distro_iso_image }}} +: "${iso_path:={{ distro_iso_image }}}" +distro_id=$(osdeploy importcheck "${iso_path}" 2>&1 \ + | sed -En 's/Detected distribution name: (.*)/\1-default/p') +osdeploy import "${iso_path}" restorecon -Rv /var/lib/confluent/ ``` @@ -36,10 +39,12 @@ You could also add `debug` here as well to increase debug messages. ```bash -# Update kernel arguments -yq -i '.kernelargs = "console=ttyS0,115200 console=tty0 rd.shell"' \ - /var/lib/confluent/public/os/{{ distro_id }}/profile.yaml -osdeploy updateboot {{ distro_id }} +# Update kernel arguments: drop quiet, add serial console +yq -i '.kernelargs |= sub("quiet ?", "")' \ + /var/lib/confluent/public/os/${distro_id}/profile.yaml +yq -i ".kernelargs += \" console=tty0 console={% if is_aarch64 %}ttyAMA0{% else %}ttyS0{% endif %},115200 rd.shell\"" \ + /var/lib/confluent/public/os/${distro_id}/profile.yaml +osdeploy updateboot ${distro_id} ``` @@ -53,6 +58,6 @@ command should be run. ```bash echo "/etc/hosts -> /etc/hosts" >> \ - /var/lib/confluent/public/os/{{ distro_id }}/syncfiles + /var/lib/confluent/public/os/${distro_id}/syncfiles ``` diff --git a/docs/install/templates/provisioner/confluent/post-add-user.md.j2 b/docs/install/templates/provisioner/confluent/post-add-user.md.j2 index 4dab6435b1..23d2a8d5fb 100644 --- a/docs/install/templates/provisioner/confluent/post-add-user.md.j2 +++ b/docs/install/templates/provisioner/confluent/post-add-user.md.j2 @@ -17,9 +17,9 @@ credential files on *compute* nodes: ```bash # Create a sync file for pushing user credentials to the nodes echo "/etc/passwd -> /etc/passwd" >> \ - /var/lib/confluent/public/os/{{ distro_id }}/syncfiles + /var/lib/confluent/public/os/${distro_id}/syncfiles echo "/etc/group -> /etc/group" >> \ - /var/lib/confluent/public/os/{{ distro_id }}/syncfiles + /var/lib/confluent/public/os/${distro_id}/syncfiles # Use Confluent to distribute credentials to nodes nodeapply -F compute From 7af8737c9142051b697ac68ebf5a1166d7929209 Mon Sep 17 00:00:00 2001 From: Timothy Middelkoop Date: Wed, 29 Apr 2026 20:28:22 -0500 Subject: [PATCH 2/3] OpenCHAMI backports from 3.x Signed-off-by: Timothy Middelkoop --- docs/install/templates/base-os/proxy.md.j2 | 6 ++++-- .../provisioner/openchami/compute-image-build.md.j2 | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/install/templates/base-os/proxy.md.j2 b/docs/install/templates/base-os/proxy.md.j2 index fa13a4b651..6dbdd53c03 100644 --- a/docs/install/templates/base-os/proxy.md.j2 +++ b/docs/install/templates/base-os/proxy.md.j2 @@ -1,8 +1,10 @@ ## Configure HTTPS Proxy (Optional) If your environment requires an HTTPS caching proxy for external network access, -configure it here before installing any packages. The placeholder below marks -where site-specific proxy setup should be injected by a pre-processing step. +configure it here before installing any packages. + +{# The placeholder below marks where site-specific proxy setup should be injected by +a pre-processing step. #} diff --git a/docs/install/templates/provisioner/openchami/compute-image-build.md.j2 b/docs/install/templates/provisioner/openchami/compute-image-build.md.j2 index 7b5bc09c24..d899c78114 100644 --- a/docs/install/templates/provisioner/openchami/compute-image-build.md.j2 +++ b/docs/install/templates/provisioner/openchami/compute-image-build.md.j2 @@ -222,6 +222,9 @@ repos: - alias: 'OpenHPC' url: '{{ ohpc_repo_server }}/OpenHPC/{{ ohpc_version_tree }}/{{ ostree }}' gpg: 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OpenHPC-{{ ohpc_version_tree }}' + - alias: 'OpenHPC-updates' + url: '{{ ohpc_repo_server }}/OpenHPC/{{ ohpc_version_tree }}/updates/{{ ostree }}' + gpg: 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OpenHPC-{{ ohpc_version_tree }}' copyfiles: - src: '/data/hosts' dest: '/etc/hosts' From 778e6c37e04ed9290ccc593bdafd941959bf78a4 Mon Sep 17 00:00:00 2001 From: Timothy Middelkoop Date: Mon, 1 Jun 2026 21:04:23 -0500 Subject: [PATCH 3/3] docs(openeuler): clarify COPR repo purpose in repos.md.j2 The OpenHPC COPR repository is required on the head node (not only in the compute image) because it provides tools such as yq used during Warewulf configuration. Update the comment label and surrounding prose to reflect this accurately. Signed-off-by: Timothy Middelkoop Co-Authored-By: Claude Sonnet 4.6 --- docs/install/templates/distro/openeuler/repos.md.j2 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/install/templates/distro/openeuler/repos.md.j2 b/docs/install/templates/distro/openeuler/repos.md.j2 index aaa132c926..a171447ec7 100644 --- a/docs/install/templates/distro/openeuler/repos.md.j2 +++ b/docs/install/templates/distro/openeuler/repos.md.j2 @@ -2,12 +2,11 @@ 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: +Everything, and EPOL main repositories are typically enabled by default. The +OpenHPC COPR repository also provides additional required tools such as `yq`: - + ```bash {{ pkg_add_repo }} {{ openeuler_ohpc_repo_server }}\