Skip to content

Commit 5022bd8

Browse files
martinpittrichm
authored andcommitted
fix: Adjust for Ansible 2.19
- Ensure boolean values for `when:` conditions. - Avoid `ansible_managed` variable, it's an internal constant. - Remove jinja templates from assertions.
1 parent 39e2319 commit 5022bd8

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

handlers/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
- name: Handle nbde_client update initramfs
55
when:
66
- __nbde_client_update_initramfs | bool
7-
- __nbde_client_initramfs_update_cmd | default("")
7+
- __nbde_client_initramfs_update_cmd | default("") | length > 0
88
command: "{{ __nbde_client_initramfs_update_cmd }}"
99
changed_when: false
1010

tasks/main-clevis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
- name: Check whether devices are at the desired state
2626
when:
27-
- nbde_client_bindings | default([])
27+
- nbde_client_bindings | default([]) | length > 0
2828
nbde_client_clevis:
2929
bindings: "{{ nbde_client_bindings | default([]) }}"
3030
check_mode: true
@@ -41,7 +41,7 @@
4141
state: directory
4242
suffix: nbde_client_encryption_keys
4343
when:
44-
- nbde_client_bindings | default([])
44+
- nbde_client_bindings | default([]) | length > 0
4545
register: nbde_client_tempdir
4646

4747
- name: Ensure we transfer key files
@@ -51,15 +51,15 @@
5151
mode: '0400'
5252
when:
5353
- nbde_client_tempdir.path is defined
54-
- item.encryption_key_src | default("")
54+
- item.encryption_key_src | default("") | length > 0
5555
loop: "{{ nbde_client_bindings }}"
5656
loop_control:
5757
label: "{{ item.encryption_key_src | default('') }}"
5858
no_log: true
5959

6060
- name: Perform clevis operations
6161
when:
62-
- nbde_client_bindings | default([])
62+
- nbde_client_bindings | default([]) | length > 0
6363
- nbde_client_tempdir.path is defined
6464
nbde_client_clevis:
6565
bindings: "{{ nbde_client_bindings | default([]) }}"
@@ -78,7 +78,7 @@
7878
path: "{{ nbde_client_tempdir.path }}"
7979
state: absent
8080
when:
81-
- nbde_client_bindings | default([])
81+
- nbde_client_bindings | default([]) | length > 0
8282
- nbde_client_tempdir.path is defined
8383

8484
- name: Deploy mechanism to clear network configuration generated during early boot

tests/tasks/check_header.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
- name: Check for presence of ansible managed header, fingerprint
1010
assert:
1111
that:
12-
- ansible_managed in content
12+
- __ansible_managed in content
1313
- __fingerprint in content
1414
vars:
1515
content: "{{ (__file_content | d(__content)).content | b64decode }}"
16-
ansible_managed: "{{ lookup('template', 'get_ansible_managed.j2') }}"
16+
__ansible_managed: "{{ lookup('template', 'get_ansible_managed.j2') }}"

tests/tests_default_vars.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
name: linux-system-roles.nbde_client
1010
- name: Assert that the role declares all parameters in defaults
1111
assert:
12-
that: "{{ item }} is defined"
13-
loop:
14-
- nbde_client_provider
15-
- nbde_client_bindings
12+
that:
13+
- nbde_client_provider is defined
14+
- nbde_client_bindings is defined
15+
1616
# vim:set ts=2 sw=2 et:

0 commit comments

Comments
 (0)