Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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"
3 changes: 1 addition & 2 deletions docs/install/recipes/almalinux10-x86_64-confluent-slurm.yaml
Original file line number Diff line number Diff line change
@@ -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"
3 changes: 1 addition & 2 deletions docs/install/recipes/rocky10-aarch64-confluent-slurm.yaml
Original file line number Diff line number Diff line change
@@ -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"
3 changes: 1 addition & 2 deletions docs/install/recipes/rocky10-x86_64-confluent-slurm.yaml
Original file line number Diff line number Diff line change
@@ -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"
6 changes: 4 additions & 2 deletions docs/install/templates/base-os/proxy.md.j2
Original file line number Diff line number Diff line change
@@ -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. #}

<!-- ohpc_begin -->
<!-- ohpc_comment Configure HTTPS proxy for head node (site-specific) -->
Expand Down
7 changes: 3 additions & 4 deletions docs/install/templates/distro/openeuler/repos.md.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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`:

<!-- ohpc_begin -->
<!-- ohpc_comment Install EPOL -->
<!-- ohpc_comment Enable OpenHPC COPR repository -->

```bash
{{ pkg_add_repo }} {{ openeuler_ohpc_repo_server }}\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,6 @@ network services like DNS and DHCP. These tasks are accomplished as follows:
<!-- ohpc_comment Complete networking setup, associate provisioning image -->
```bash
# Associate desired provisioning image for computes
nodedeploy -n compute -p {{ distro_id }}
nodedeploy -n compute -p ${distro_id}
```
<!-- ohpc_end -->
17 changes: 11 additions & 6 deletions docs/install/templates/provisioner/confluent/init-os-images.md.j2
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ initialize -i`
<!-- ohpc_comment Initialize OS images for use with Confluent -->
```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/
```
<!-- ohpc_end -->
Expand All @@ -36,10 +39,12 @@ You could also add `debug` here as well to increase debug messages.

<!-- ohpc_begin -->
```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}
```
<!-- ohpc_end -->

Expand All @@ -53,6 +58,6 @@ command should be run.
<!-- ohpc_comment Sync the hosts file in cluster -->
```bash
echo "/etc/hosts -> /etc/hosts" >> \
/var/lib/confluent/public/os/{{ distro_id }}/syncfiles
/var/lib/confluent/public/os/${distro_id}/syncfiles
```
<!-- ohpc_end -->
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Loading