Compare commits

..

2 Commits

Author SHA1 Message Date
75a84f7724 Merge pull request 'Rename async job variables for consistency' (#5) from fix/basic_tag_violation into main
Reviewed-on: #5
2026-06-02 06:16:01 +00:00
Damien
6b9fccb1ea Rename async job variables for consistency
Rename async job variables in UFW and upgrade roles to follow a
consistent
naming pattern (upgrade_<os>_job) for better maintainability.
2026-06-02 08:13:05 +02:00
2 changed files with 17 additions and 17 deletions

View File

@@ -18,11 +18,11 @@
- name: Add UFW to default runlevel (Alpine) - name: Add UFW to default runlevel (Alpine)
ansible.builtin.command: ansible.builtin.command:
cmd: rc-update add ufw default cmd: rc-update add ufw default
register: rc_update_result register: ufw_rc_update_result
changed_when: >- # " >- : transform multiple lines into one line" changed_when: >- # " >- : transform multiple lines into one line"
'already' not in rc_update_result.stdout 'already' not in ufw_rc_update_result.stdout
and 'already' not in rc_update_result.stderr and 'already' not in ufw_rc_update_result.stderr
failed_when: rc_update_result.rc != 0 failed_when: ufw_rc_update_result.rc != 0
when: ansible_facts['os_family'] == "Alpine" when: ansible_facts['os_family'] == "Alpine"
- name: Set default incoming policy - name: Set default incoming policy

View File

@@ -10,7 +10,7 @@
update_cache: true update_cache: true
async: 3600 async: 3600
poll: 0 poll: 0
register: alpine_upgrade register: upgrade_alpine_job
# By default async job return change: true # By default async job return change: true
# Force adapting the change condition for idempotency # Force adapting the change condition for idempotency
changed_when: false changed_when: false
@@ -18,18 +18,18 @@
- name: Wait for Alpine upgrade - name: Wait for Alpine upgrade
ansible.builtin.async_status: ansible.builtin.async_status:
jid: "{{ alpine_upgrade.ansible_job_id }}" jid: "{{ upgrade_alpine_job.ansible_job_id }}"
register: alpine_result register: upgrade_alpine_result
until: alpine_result.finished until: upgrade_alpine_result.finished
retries: 60 retries: 60
delay: 10 delay: 10
# By default async job return change: true # By default async job return change: true
# Force adapting the change condition for idempotency # Force adapting the change condition for idempotency
changed_when: alpine_result.changed | default(false) changed_when: upgrade_alpine_result.changed | default(false)
ignore_unreachable: true ignore_unreachable: true
when: when:
- ansible_facts['os_family'] == "Alpine" - ansible_facts['os_family'] == "Alpine"
- alpine_upgrade.ansible_job_id is defined - upgrade_alpine_job.ansible_job_id is defined
- name: Upgrade all packages (Debian) - name: Upgrade all packages (Debian)
ansible.builtin.apt: ansible.builtin.apt:
@@ -37,7 +37,7 @@
update_cache: true update_cache: true
async: 3600 async: 3600
poll: 0 poll: 0
register: debian_upgrade register: upgrade_debian_job
# By default async job return change: true # By default async job return change: true
# Force adapting the change condition for idempotency # Force adapting the change condition for idempotency
changed_when: false changed_when: false
@@ -45,15 +45,15 @@
- name: Wait for Debian upgrade - name: Wait for Debian upgrade
ansible.builtin.async_status: ansible.builtin.async_status:
jid: "{{ debian_upgrade.ansible_job_id }}" jid: "{{ upgrade_debian_job.ansible_job_id }}"
register: debian_result register: upgrade_debian_result
until: debian_result.finished until: upgrade_debian_result.finished
retries: 60 retries: 60
delay: 10 delay: 10
# By default async job return change: true # By default async job return change: true
# Force adapting the change condition for idempotency # Force adapting the change condition for idempotency
changed_when: debian_result.changed | default(false) changed_when: upgrade_debian_result.changed | default(false)
ignore_unreachable: true ignore_unreachable: true
when: when:
- ansible_facts['os_family'] == "Debian" - ansible_facts['os_family'] == "Debian"
- debian_upgrade.ansible_job_id is defined - upgrade_debian_job.ansible_job_id is defined