Skip to content

Commit 5477672

Browse files
committed
Merge branch 'main' into feat/fatimage
2 parents 59e19de + c130ed9 commit 5477672

File tree

5 files changed

+11
-5
lines changed

5 files changed

+11
-5
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
./.github/CODEOWNERS

environments/arcus/terraform/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ variable "create_nodes" {
1717
variable "cluster_image" {
1818
description = "single image for all cluster nodes - a convenience for CI"
1919
type = string
20-
default = "ohpc-fatimage-230217-1455-8da3c5a7" # https://github.com/stackhpc/ansible-slurm-appliance/pull/250
20+
default = "openhpc-230217-1440.qcow2" # https://github.com/stackhpc/slurm_image_builder/pull/15
2121
# default = "Rocky-8-GenericCloud-Base-8.7-20221130.0.x86_64.qcow2"
2222
# default = "Rocky-8-GenericCloud-8.6.20220702.0.x86_64.qcow2"
2323
}

environments/common/inventory/group_vars/all/defaults.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ grafana_address: "{{ hostvars[groups['grafana'].0].api_address }}"
2121

2222
############################# bootstrap: local user configuration #########################
2323

24-
# Parameters for these users replicate what gets created using image openhpc-220526-1354.qcow2 image + appliance run.
2524
# Note RockyLinux 8.5 defines system user/groups in range 201-999
2625
appliances_local_users_ansible_user_name: "{{ ansible_ssh_user | default(ansible_user) }}"
2726
appliances_local_users_podman: # also used in environments/common/inventory/group_vars/all/podman.yml:podman_users

environments/common/inventory/group_vars/all/openhpc.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,15 @@ openhpc_slurmdbd_host: "{{ openhpc_slurm_control_host }}"
1818
openhpc_slurm_partitions:
1919
- name: "compute"
2020
openhpc_packages_default:
21+
# system packages
22+
- podman
23+
# OpenHPC packages
2124
- slurm-libpmi-ohpc # to allow intel mpi to work properly
2225
- ohpc-gnu12-openmpi4-perf-tools # for hpctests
2326
- openblas-gnu12-ohpc # for hpctests (HPL)
27+
# EPEL packages:
28+
- apptainer
29+
- podman-compose
2430
openhpc_packages_extra: []
2531
openhpc_packages: "{{ openhpc_packages_default + openhpc_packages_extra }}"
2632
openhpc_munge_key: "{{ vault_openhpc_mungekey | b64decode }}"

requirements.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ roles:
33
- src: stackhpc.nfs
44
version: v22.9.1
55
- src: https://github.com/stackhpc/ansible-role-openhpc.git
6-
version: v0.17.0 # workaround for elrepo apptainer changes
6+
version: v0.18.0 # requires/uses openhpc v2.6.1
77
name: stackhpc.openhpc
88
- src: https://github.com/stackhpc/ansible-node-exporter.git
99
version: feature/no-install
@@ -17,9 +17,9 @@ roles:
1717
name: cloudalchemy.grafana
1818
version: service-state
1919
# No versions available
20-
- src: https://github.com/stackhpc/ood-ansible.git
20+
- src: https://github.com/OSC/ood-ansible.git
2121
name: osc.ood
22-
version: shpc/releasever # based on v2.0.8
22+
version: v2.0.8
2323

2424
collections:
2525
- name: containers.podman

0 commit comments

Comments
 (0)