Skip to content

Commit e077d6f

Browse files
collection_default, role_default: Fix off-by-one and templating errors in setup task examples
1 parent 16fc3f9 commit e077d6f

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

collection_default/roles/run/tasks/setup/install/default.yml.j2

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44

55
- name: "Setup | Install | Default | Remove unwanted packages (e.g., to prevent conflicts or resolve incompatibilities)"
66
ansible.builtin.package:
7-
name: "{{ '{{ run_' + collection_name + '_packages_removal }}' }}"
7+
name: "{{ '{{ __run_' + collection_name + '_packages_removal }}' }}"
88
state: "absent"
99
when:
10-
- __run_{{ collection_name }}__packages_removal is defined
11-
- (__run_{{ collection_name }}__packages_removal | length) > 1
10+
- __run_{{ collection_name }}_packages_removal is defined
11+
- (__run_{{ collection_name }}_packages_removal | length) > 0
1212

1313

1414
- name: "Setup | Install | Default | Install or upgrade packages"
1515
ansible.builtin.package:
16-
name: "{{ '{{ run_' + collection_name + '_packages_install }}' }}"
17-
state: "{{ '{%' }} 'latest' if run_{{ collection_name }}_autoupgrade else 'present' {{ '%}' }}"
16+
name: "{{ '{{ __run_' + collection_name + '_packages_install }}' }}"
17+
state: "{{ '{{' }} 'latest' if run_{{ collection_name }}_autoupgrade else 'present' {{ '}}' }}"
1818
when:
1919
- __run_{{ collection_name }}_packages_install is defined
20-
- (__run_{{ collection_name }}_packages_install | length) > 1
20+
- (__run_{{ collection_name }}_packages_install | length) > 0

collection_default/roles/run/tasks/setup/uninstall/default.yml.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
- name: "Setup | Uninstall | Remove packages"
66
ansible.builtin.package:
7-
name: "{{ '{{ run_' + collection_name + '_packages_uninstall }}' }}"
7+
name: "{{ '{{ __run_' + collection_name + '_packages_uninstall }}' }}"
88
state: "absent"
99
when:
1010
- __run_{{ collection_name }}_packages_uninstall is defined
11-
- (__run_{{ collection_name }}_packages_uninstall | length) > 1
11+
- (__run_{{ collection_name }}_packages_uninstall | length) > 0

role_default/tasks/setup/install/default.yml.j2

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44

55
- name: "Setup | Install | Default | Remove unwanted packages (e.g., to prevent conflicts or resolve incompatibilities)"
66
ansible.builtin.package:
7-
name: "{{ '{{ ' + role_name + '_packages_removal }}' }}"
7+
name: "{{ '{{ __' + role_name + '_packages_removal }}' }}"
88
state: "absent"
99
when:
10-
- __{{ role_name }}__packages_removal is defined
11-
- (__{{ role_name }}__packages_removal | length) > 1
10+
- __{{ role_name }}_packages_removal is defined
11+
- (__{{ role_name }}_packages_removal | length) > 0
1212

1313

1414
- name: "Setup | Install | Default | Install or upgrade packages"
1515
ansible.builtin.package:
16-
name: "{{ '{{ ' + role_name + '_packages_install }}' }}"
17-
state: "{{ '{%' }} 'latest' if run_{{ role_name }}_autoupgrade else 'present' {{ '%}' }}"
16+
name: "{{ '{{ __' + role_name + '_packages_install }}' }}"
17+
state: "{{ '{{' }} 'latest' if run_{{ role_name }}_autoupgrade else 'present' {{ '}}' }}"
1818
when:
1919
- __{{ role_name }}_packages_install is defined
20-
- (__{{ role_name }}_packages_install | length) > 1
20+
- (__{{ role_name }}_packages_install | length) > 0

role_default/tasks/setup/uninstall/default.yml.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
- name: "Setup | Uninstall | Remove packages"
66
ansible.builtin.package:
7-
name: "{{ '{{ ' + role_name + '_packages_uninstall }}' }}"
7+
name: "{{ '{{ __' + role_name + '_packages_uninstall }}' }}"
88
state: "absent"
99
when:
1010
- __{{ role_name }}_packages_uninstall is defined
11-
- (__{{ role_name }}_packages_uninstall | length) > 1
11+
- (__{{ role_name }}_packages_uninstall | length) > 0

0 commit comments

Comments
 (0)