Skip to content
Merged
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
4 changes: 2 additions & 2 deletions .github/workflows/trivyscan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:
run: sudo guestmount -a /mnt/images/${{ steps.manifest.outputs.image-name }}.qcow2 -i --ro -o allow_other './${{ steps.manifest.outputs.image-name }}'

- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@v0.33.1
uses: aquasecurity/trivy-action@0.33.1
with:
scan-type: fs
scan-ref: "${{ steps.manifest.outputs.image-name }}"
Expand All @@ -122,7 +122,7 @@ jobs:
category: "${{ matrix.build }}"

- name: Fail if scan has CRITICAL vulnerabilities
uses: aquasecurity/trivy-action@v0.33.1
uses: aquasecurity/trivy-action@0.33.1
with:
scan-type: fs
scan-ref: "${{ steps.manifest.outputs.image-name }}"
Expand Down
19 changes: 5 additions & 14 deletions ansible/roles/compute_init/files/compute-init.yml
Original file line number Diff line number Diff line change
Expand Up @@ -277,22 +277,13 @@
name: basic_users
when: enable_basic_users

- name: EESSI
when: enable_eessi
# NB: don't need conditional block on enable_compute as have already exited
# if not the case
block:
- name: Copy cvmfs config
ansible.builtin.copy:
src: /var/tmp/cluster/cvmfs/default.local
dest: /etc/cvmfs/default.local
owner: root
group: root
mode: "0644"

- name: Ensure CVMFS config is setup # noqa: no-changed-when
ansible.builtin.command:
cmd: "cvmfs_config setup"
- name: Configure EESSI
ansible.builtin.include_role:
name: eessi
tasks_from: configure.yml
when: enable_eessi

- name: Configure VGPUs
ansible.builtin.include_role:
Expand Down
11 changes: 0 additions & 11 deletions ansible/roles/compute_init/tasks/export.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,6 @@
run_once: true
delegate_to: "{{ groups['control'] | first }}"

- name: Copy EESSI CVMFS config to /exports/cluster
ansible.builtin.copy:
src: /etc/cvmfs/default.local
dest: /exports/cluster/cvmfs/default.local
owner: slurm
group: root
mode: "0644"
remote_src: true
run_once: true
delegate_to: "{{ groups['control'] | first }}"

- name: Export cacerts
ansible.builtin.include_role:
name: cacerts
Expand Down
2 changes: 2 additions & 0 deletions ansible/roles/compute_init/tasks/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@
dest: roles/
- src: ../../nhc
dest: roles/
- src: ../../eessi
dest: roles/

- name: Add filter_plugins to ansible.cfg
ansible.builtin.lineinfile:
Expand Down
17 changes: 17 additions & 0 deletions ansible/roles/eessi/tasks/configure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,20 @@
- name: Ensure CVMFS config is setup # noqa: no-changed-when
ansible.builtin.command:
cmd: "cvmfs_config setup"

# configure gpus
- name: Check for NVIDIA GPU
ansible.builtin.stat:
path: /dev/nvidia0
register: nvidia_driver

- name: Set fact if NVIDIA GPU is present
ansible.builtin.set_fact:
has_nvidia_driver: "{{ nvidia_driver.stat.exists | default(false) }}"

- name: Expose GPU drivers
ansible.builtin.shell: |
source /cvmfs/software.eessi.io/versions/2023.06/init/bash
/cvmfs/software.eessi.io/versions/2023.06/scripts/gpu_support/nvidia/link_nvidia_host_libraries.sh
when: has_nvidia_driver
changed_when: true
4 changes: 2 additions & 2 deletions environments/.stackhpc/tofu/cluster_image.auto.tfvars.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"cluster_image": {
"RL8": "openhpc-RL8-251027-1123-d389c00b",
"RL9": "openhpc-RL9-251027-1123-d389c00b"
"RL8": "openhpc-RL8-251119-1202-332ac921",
"RL9": "openhpc-RL9-251119-1202-332ac921"
}
}