Skip to content

Commit b5d8b05

Browse files
committed
run validate automatically when running install-rpms task
1 parent fe6ebaa commit b5d8b05

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

ansible/roles/cve-2023-41914/README.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,13 @@ This role can be run in two ways:
1818

1919
**NB**: This playbook will ALWAYS stop and restart Slurm, even if no updates are actually required.
2020

21-
2. To remediate images during build (i.e no Slurm services are running, no slurm database exists), run `tasks/validate.yml` then `tasks/install-rpms.yml`, e.g. using the following in an environment pre-hook:
21+
2. To remediate images during build (i.e no Slurm services are running, no slurm database exists), run `tasks/install-rpms.yml`, e.g. using the following in an environment pre-hook:
2222

2323
```yaml
2424
- hosts: builder
2525
gather_facts: no
2626
become: yes
2727
tasks:
28-
- name: Check fixes for cve-2023-41914 can be applied
29-
import_role:
30-
name: cve-2023-41914
31-
tasks_from: validate.yml
3228
- name: Apply fixes for cve-2023-41914
3329
import_role:
3430
name: cve-2023-41914

ansible/roles/cve-2023-41914/tasks/install-rpms.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
- name: Validate suitability
2+
include_tasks: validate.yml
3+
when: _cve_2023_41814_installed_pkgs is undefined
4+
15
- name: Identify packages to update
26
set_fact:
37
_cve_2023_41814_updates: "{{ _cve_2023_41814_updates + [item] }}"

environments/.stackhpc/hooks/post.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
gather_facts: no
33
become: yes
44
tasks:
5-
- name: Check fixes for cve-2023-41914 can be applied
6-
import_role:
7-
name: cve-2023-41914
8-
tasks_from: validate.yml
95
- name: Apply fixes for cve-2023-41914
106
import_role:
117
name: cve-2023-41914

0 commit comments

Comments
 (0)