diff --git a/.ansible-lint b/.ansible-lint index d8dc293..c1fba50 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -5,3 +5,4 @@ skip_list: - no-changed-when - run-once[play] - name[template] + - jinja[spacing] diff --git a/bigboot_execute_resize.yml b/bigboot_execute_resize.yml index 8fc4a30..664ac97 100644 --- a/bigboot_execute_resize.yml +++ b/bigboot_execute_resize.yml @@ -11,8 +11,8 @@ tasks: - name: Perform service and filesystem checks prior to Bigboot execution when: - - (bigboot_data[inventory_hostname]['bigboot_execute_shrink_lv'] | bool - or bigboot_data[inventory_hostname]['bigboot_execute_bigboot'] | bool) + - (bigboot_data[inventory_hostname]['bigboot_execute_shrink_lv'] | default(false) | bool + or bigboot_data[inventory_hostname]['bigboot_execute_bigboot'] | default(false) | bool) block: - name: Check for and disable services exceeding the timeout threshold ansible.builtin.import_tasks: tasks/check_systemd_services.yml @@ -23,7 +23,7 @@ The following services were disabled, and will be re-enabled post Bigboot execution: - {{ bigboot_systemd_disabled_services | flatten }} + {{ bigboot_systemd_disabled_services | list | flatten }} when: - bigboot_systemd_disabled_services is defined - bigboot_systemd_disabled_services | length > 0 diff --git a/bigboot_rear_backup.yml b/bigboot_rear_backup.yml index 786c8c7..6cbd66e 100644 --- a/bigboot_rear_backup.yml +++ b/bigboot_rear_backup.yml @@ -17,6 +17,6 @@ - name: Perform a ReaR backup before the /boot expansion ansible.builtin.import_playbook: rhc.rear.rear_backup when: - - (bigboot_data[inventory_hostname]['bigboot_execute_shrink_lv'] | bool - or bigboot_data[inventory_hostname]['bigboot_execute_bigboot'] | bool) + - (bigboot_data[inventory_hostname]['bigboot_execute_shrink_lv'] | default(false) | bool + or bigboot_data[inventory_hostname]['bigboot_execute_bigboot'] | default(false) | bool) - not bigboot_rear_backup_skip | default(false) | bool diff --git a/bigboot_setup_environment.yml b/bigboot_setup_environment.yml index 1d356a0..0b1b545 100644 --- a/bigboot_setup_environment.yml +++ b/bigboot_setup_environment.yml @@ -35,6 +35,9 @@ - name: Set environment for subsequent workflow nodes ansible.builtin.set_stats: + aggregate: false + per_host: false + data: bigboot_data: "{{ bigboot_data | default({}) | combine({inventory_hostname: @@ -46,12 +49,12 @@ 'bigboot_size': bigboot_size } }) }}" - rear_backup_skip: "{{ bigboot_rear_backup_skip | default(false) }}" - name: Perform a ReaR backup if any disk modifications are to be made ansible.builtin.import_playbook: rhc.rear.rear_backup when: - - bigboot_execute_bigboot | bool or bigboot_execute_bigboot | bool + - bigboot_execute_shrink_lv | default(false) | bool + or bigboot_execute_bigboot | default(false) | bool - not bigboot_rear_backup_skip | default(false) | bool ...