Skip to content

Commit f6477c7

Browse files
committed
Fix linting issues on the merge of origin/main
1 parent 47c9ffe commit f6477c7

File tree

43 files changed

+220
-209
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+220
-209
lines changed

ansible/extras.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,16 @@
5252

5353
- name: Setup vGPU
5454
hosts: vgpu
55-
become: yes
56-
gather_facts: yes
55+
become: true
56+
gather_facts: true
5757
tags: vgpu
5858
tasks:
59-
- include_role:
59+
- ansible.builtin.include_role:
6060
name: stackhpc.linux.vgpu
6161
tasks_from: "{{ 'configure.yml' if appliances_mode == 'configure' else 'install.yml' }}"
6262
handlers:
63-
- name: reboot
64-
fail:
63+
- name: reboot # noqa: name[casing]
64+
ansible.builtin.fail:
6565
msg: Reboot handler for stackhpc.linux.vgpu role fired unexpectedly. This was supposed to be unreachable.
6666

6767
- name: Persist hostkeys across rebuilds

ansible/fatimage.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179
name: ondemand_exporter
180180
when: "'openondemand' in group_names"
181181

182-
- name: slurm exporter
182+
- name: Slurm exporter
183183
ansible.builtin.include_role:
184184
name: slurm_exporter
185185
tasks_from: install.yml
@@ -258,18 +258,18 @@
258258
- ansible.builtin.import_role:
259259
name: cloudalchemy.grafana
260260
tasks_from: install.yml
261-
- import_role:
261+
- ansible.builtin.import_role:
262262
name: cloudalchemy.grafana
263263
tasks_from: plugins.yml
264-
- include_role: # done in same play so it can use handlers from cloudalchemy.grafana
264+
- ansible.builtin.include_role: # done in same play so it can use handlers from cloudalchemy.grafana
265265
name: grafana-dashboards
266266

267267
- name: Add support for NVIDIA GPU auto detection to Slurm
268268
hosts: cuda
269-
become: yes
269+
become: true
270270
tasks:
271271
- name: Recompile slurm
272-
import_role:
272+
ansible.builtin.import_role:
273273
name: slurm_recompile
274274
vars:
275275
slurm_recompile_with_nvml: "{{ groups.cuda | length > 0 }}"

ansible/final.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
- hosts: dnf_repos
2-
become: yes
2+
become: true
33
tags: dnf_repos
44
tasks:
55
- name: Disable pulp repos
@@ -12,19 +12,19 @@
1212
hosts: compute_init:!builder
1313
# NB: done last so other roles can prepare configuration etc
1414
tags: compute_init
15-
become: yes
15+
become: true
1616
tasks:
17-
- include_role:
17+
- ansible.builtin.include_role:
1818
name: compute_init
1919
tasks_from: export.yml
2020

2121
- hosts: proxy
2222
gather_facts: false
2323
tags: proxy
24-
become: yes
24+
become: true
2525
tasks:
26-
- include_role:
26+
- ansible.builtin.include_role:
2727
name: proxy
2828
vars:
2929
proxy_state: absent
30-
when: proxy_remove | default(false) | bool == true
30+
when: proxy_remove | default(false) | bool

ansible/monitoring.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
- name: Skip prometheus install if prometheus binaries exist and prometheus_version not defined
7272
# i.e. if prometheus_version isn't defined we don't care, so use what's already there
7373
ansible.builtin.set_fact:
74-
prometheus_skip_install: "{{ false if prometheus_version is defined else true }}"
74+
prometheus_skip_install: "{{ false if prometheus_version is defined else true }}"
7575
when: "(prometheus_binaries.results | map(attribute='stat') | map(attribute='exists')) + [prometheus_skip_install is not defined]"
7676
- ansible.builtin.import_role:
7777
name: cloudalchemy.prometheus

ansible/roles/compute_init/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ it also requires an image build with the role name added to the
5454
| bootstrap.yml | dnf_repos | None at present [2] | - |
5555
| bootstrap.yml | cacerts | Supported [3] | - |
5656
| bootstrap.yml | squid | Not relevant for compute nodes | n/a |
57-
| bootstrap.yml | tuned | Fully supported | No |
57+
| bootstrap.yml | tuned | Fully supported | No |
5858
| bootstrap.yml | freeipa_server | Not relevant for compute nodes | n/a |
5959
| bootstrap.yml | cockpit | None required - use image build | No |
6060
| bootstrap.yml | firewalld | Not relevant for compute nodes | n/a |
@@ -91,7 +91,7 @@ it also requires an image build with the role name added to the
9191
| portal.yml | (openondemand vnc desktop) | None required - use image build | No |
9292
| portal.yml | (openondemand jupyter server) | None required - use image build | No |
9393
| monitoring.yml | node_exporter | None required - use image build | No |
94-
| monitoring.yml | (other monitoring) | Not relevant for compute nodes | - |
94+
| monitoring.yml | (other monitoring) | Not relevant for compute nodes | - |
9595
| disable-repos.yml | dnf_repos | None at present [2] | - |
9696
| hooks/post.yml | ? | None at present | - |
9797

ansible/roles/compute_init/files/compute-init.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,6 @@
297297
- name: Ensure CVMFS config is setup # noqa: no-changed-when
298298
ansible.builtin.command:
299299
cmd: "cvmfs_config setup"
300-
when: enable_eessi
301300

302301
- name: Configure VGPUs
303302
ansible.builtin.include_role:
@@ -366,7 +365,7 @@
366365
tasks_from: boot.yml
367366
when: enable_nhc
368367

369-
- name: Ensure node is resumed
368+
- name: Ensure node is resumed # noqa: no-changed-when
370369
# TODO: consider if this is always safe for all job states?
371370
ansible.builtin.command: scontrol update state=resume nodename={{ ansible_hostname }}
372371
register: _scontrol_update

ansible/roles/compute_init/tasks/export.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
when: "'sshd' in group_names"
102102

103103
- name: Export generated NHC config
104-
import_role:
104+
ansible.builtin.import_role:
105105
name: nhc
106106
tasks_from: export.yml
107107
when: "'nhc' in group_names"

ansible/roles/cuda/tasks/facts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
---
22
- name: Set cuda_facts_version_short
3-
set_fact:
3+
ansible.builtin.set_fact:
44
cuda_facts_version_short: "{{ cuda_version_short }}"

ansible/roles/dnf_repos/tasks/disable_repos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@
2828
path: "{{ item.path }}"
2929
regexp: '^enabled\ ?=\ ?1'
3030
replace: 'enabled=0'
31-
backup: yes
31+
backup: true
3232
loop: "{{ _dnf_repo_files.files }}"
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
---
2-
doca_version:"2.9.3" # 2.9 is LTS, last to support ConnectX-4, 3 years for bug fixes and CVE updates
2+
3+
doca_version: "2.9.3" # 2.9 is LTS, last to support ConnectX-4, 3 years for bug fixes and CVE updates
34
doca_profile: doca-ofed
45
doca_repo_url: "https://linux.mellanox.com/public/repo/doca/{{ doca_version }}/rhel{{ ansible_distribution_version }}/{{ ansible_architecture }}/"

0 commit comments

Comments
 (0)