Skip to content

Commit 5a55e6c

Browse files
committed
Fix linting on merge of origin/main
1 parent bb6abed commit 5a55e6c

File tree

30 files changed

+188
-170
lines changed

30 files changed

+188
-170
lines changed

.github/bin/get-s3-image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if [ -n "$image_exists" ]; then
1717
else
1818
echo "Image $image_name not found in OpenStack. Getting it from S3."
1919

20-
wget https://leafcloud.store/swift/v1/AUTH_f39848421b2747148400ad8eeae8d536/$bucket_name/$image_name --progress=dot:giga
20+
wget "https://leafcloud.store/swift/v1/AUTH_f39848421b2747148400ad8eeae8d536/$bucket_name/$image_name" --progress=dot:giga
2121

2222
echo "Uploading image $image_name to OpenStack..."
2323
openstack image create --file "$image_name" --disk-format qcow2 "$image_name" --progress

ansible/bootstrap.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
search_string: HOSTNAME=$(/usr/bin/hostnamectl --transient 2>/dev/null) || \
8383
state: absent
8484
- name: Add system user groups
85-
ansible.builtin.group: "{{ item.group }}"
85+
ansible.builtin.group: "{{ item.group }}" # noqa: args[module]
8686
loop: "{{ appliances_local_users }}"
8787
when:
8888
- item.enable | default(true) | bool
@@ -91,7 +91,7 @@
9191
# Need to change working directory otherwise we try to switch back to non-existent directory.
9292
become_flags: "-i"
9393
- name: Add system users
94-
ansible.builtin.user: "{{ item.user }}"
94+
ansible.builtin.user: "{{ item.user }}" # noqa: args[module]
9595
loop: "{{ appliances_local_users }}"
9696
when: item.enable | default(true) | bool
9797
become_method: ansible.builtin.sudo

ansible/fatimage.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@
192192
when: "'alertmanager' in group_names"
193193

194194
- name: Download HPL source
195-
include_role:
195+
ansible.builtin.include_role:
196196
name: hpctests
197197
tasks_from: source-hpl.yml
198198

@@ -207,7 +207,8 @@
207207
# can't run cloudalchemy.prometheus/tasks/install.yml as it triggers a unit start
208208
# so below is a partial extraction of this:
209209
- name: Create prometheus system group
210-
ansible.builtin.group: prometheus
210+
ansible.builtin.group:
211+
name: prometheus
211212
system: true
212213
state: present
213214

@@ -270,7 +271,7 @@
270271

271272
- name: Add support for NVIDIA GPU auto detection to Slurm
272273
hosts: slurm_recompile
273-
become: yes
274+
become: true
274275
tasks:
275276
- name: Recompile slurm
276277
ansible.builtin.import_role:

ansible/portal.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
tags:
4444
- openondemand
4545
- openondemand_rstudio
46-
become: yes
47-
gather_facts: yes
46+
become: true
47+
gather_facts: true
4848
tasks:
49-
- import_role:
49+
- ansible.builtin.import_role:
5050
name: openondemand
5151
tasks_from: rstudio_compute.yml
5252
when: appliances_mode != 'configure' # is run during build
@@ -55,10 +55,10 @@
5555
tags:
5656
- openondemand
5757
- openondemand_codeserver
58-
become: yes
59-
gather_facts: yes
58+
become: true
59+
gather_facts: true
6060
tasks:
61-
- import_role:
61+
- ansible.builtin.import_role:
6262
name: openondemand
6363
tasks_from: codeserver_compute.yml
6464
when: appliances_mode != 'configure' # is run during build

ansible/roles/alertmanager/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Alertmanager is enabled by default on the `control` node in the
1515
`site` environment's `inventory/groups` file.
1616

1717
In general usage may only require:
18+
1819
- Enabling the Slack integration (see section below).
1920
- Possibly setting `alertmanager_web_external_url`.
2021

ansible/roles/alertmanager/tasks/install.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
- name: Create alertmanager system user
3-
ansible.builtin.user: "{{ alertmanager_system_user }}"
3+
ansible.builtin.user:
4+
name: "{{ alertmanager_system_user }}"
45
system: true
56
create_home: false
67

ansible/roles/basic_users/tasks/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
- basic_users_override_sssd | bool
1919

2020
- name: Create groups
21-
ansible.builtin.group: "{{ item }}"
21+
ansible.builtin.group: "{{ item }}" # noqa: args[module]
2222
loop: "{{ basic_users_groups }}"
2323

2424
- name: Create users
25-
ansible.builtin.user: "{{ basic_users_userdefaults | combine(item) | filter_user_params() | combine(_disable_homedir) }}"
25+
ansible.builtin.user: "{{ basic_users_userdefaults | combine(item) | filter_user_params() | combine(_disable_homedir) }}" # noqa: args[module]
2626
loop: "{{ basic_users_users }}"
2727
loop_control:
2828
label: "{{ item.name }}"

ansible/roles/dnf_repos/defaults/main.yml

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

5151
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 }}"
52+
dnf_repos_repolist: "{{ dnf_repos_default_repolist + (dnf_repos_openhpc_repolist if (openhpc_install_type | default('ohpc')) == 'ohpc' else []) + dnf_repos_extra_repolist }}" # noqa: yaml[line-length]
5353

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

ansible/roles/hpctests/tasks/build-hpl.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
src: "{{ hpctests_hpl_srcdir }}/setup/Make.Linux_PII_CBLAS"
2121
dest: "{{ hpctests_hpl_srcdir }}/Make.{{ hpctests_hpl_arch }}"
2222
remote_src: true
23+
mode: "0644"
2324

2425
- name: Modify make file
2526
ansible.builtin.replace:

ansible/roles/hpctests/tasks/source-hpl.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
---
22

33
- name: Make directory
4-
file:
4+
ansible.builtin.file:
55
path: "/opt/hpl"
66
state: directory
77
owner: root
88
group: root
99
mode: '0755'
1010

1111
- name: Download HPL tarball
12-
get_url:
12+
# checkov:skip=CKV2_ANSIBLE_2: "Ensure that HTTPS url is used with get_url"
13+
ansible.builtin.get_url:
1314
url: "http://www.netlib.org/benchmark/hpl/hpl-{{ hpctests_hpl_version }}.tar.gz"
1415
dest: "/opt/hpl/hpl-{{ hpctests_hpl_version }}.tar.gz"
1516
owner: root

0 commit comments

Comments
 (0)