Skip to content

Commit 8d3261f

Browse files
committed
Merge remote-tracking branch 'origin/main' into ci/enable-linting
2 parents fc6e6e7 + 64ddd42 commit 8d3261f

File tree

5 files changed

+12
-4
lines changed

5 files changed

+12
-4
lines changed

ansible/fatimage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,8 @@
265265
name: grafana-dashboards
266266

267267
- name: Add support for NVIDIA GPU auto detection to Slurm
268-
hosts: cuda
269-
become: true
268+
hosts: slurm_recompile
269+
become: yes
270270
tasks:
271271
- name: Recompile slurm
272272
ansible.builtin.import_role:

ansible/roles/dnf_repos/defaults/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ dnf_repos_openhpc_repolist:
4848
file: OpenHPC
4949
base_url: "{{ dnf_repos_pulp_content_url }}/{{ appliances_pulp_repos.openhpc_updates[ansible_distribution_major_version] | appliances_repo_to_subpath }}"
5050

51-
dnf_repos_repolist: "{{ dnf_repos_default_repolist + (dnf_repos_openhpc_repolist if (openhpc_install_type | default('ohpc')) == 'ohpc' else []) }}"
51+
dnf_repos_extra_repolist: []
52+
dnf_repos_repolist: "{{ dnf_repos_default_repolist + (dnf_repos_openhpc_repolist if (openhpc_install_type | default('ohpc')) == 'ohpc' else []) + dnf_repos_extra_repolist }}"
5253

5354
dnf_repos_epel_baseurl: "{{ dnf_repos_pulp_content_url }}/{{ appliances_pulp_repos.epel[ansible_distribution_major_version] | appliances_repo_to_subpath }}"
5455
dnf_repos_epel_description: "epel"

ansible/roles/proxy/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
# proxy_http_proxy:
33
proxy_https_proxy: "{{ proxy_http_proxy }}"
4-
proxy_no_proxy_defaults: "{{ ['localhost', '127.0.0.1'] + groups['all'] + hostvars.values() | map(attribute='ansible_host') }}"
4+
proxy_no_proxy_defaults: "{{ ['localhost', '127.0.0.1', '169.254.169.254'] + groups['all'] + hostvars.values() | map(attribute='ansible_host') }}"
55
proxy_no_proxy_extras: []
66
proxy_no_proxy: "{{ (proxy_no_proxy_defaults + proxy_no_proxy_extras) | unique | sort | join(',') }}"
77
proxy_dnf: true

environments/common/inventory/groups

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,9 @@ freeipa_client
118118
[cuda]
119119
# Hosts to install NVIDIA CUDA on - see ansible/roles/cuda/README.md
120120

121+
[slurm_recompile]
122+
# Hosts to recompile Slurm for - allows supporting Slurm autodetection method 'nvml'
123+
121124
[vgpu]
122125
# Hosts where vGPU/MIG should be configured - see docs/mig.md
123126

environments/common/layouts/everything

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ cluster
6565
[cuda]
6666
# Hosts to install NVIDIA CUDA on - see ansible/roles/cuda/README.md
6767

68+
[slurm_recompile:children]
69+
# Hosts to recompile Slurm for - allows supporting Slurm autodetection method 'nvml'
70+
cuda
71+
6872
[eessi:children]
6973
# Hosts on which EESSI stack should be configured
7074
openhpc

0 commit comments

Comments
 (0)