diff --git a/changelogs/fragments/add_leapp_resume_variables.yml b/changelogs/fragments/add_leapp_resume_variables.yml new file mode 100644 index 0000000..291ab6d --- /dev/null +++ b/changelogs/fragments/add_leapp_resume_variables.yml @@ -0,0 +1,4 @@ +--- +minor_changes: + - Added variables to the leapp_resume task to control task retries and delays. +... diff --git a/roles/upgrade/README.md b/roles/upgrade/README.md index 027bead..23c01e6 100644 --- a/roles/upgrade/README.md +++ b/roles/upgrade/README.md @@ -17,6 +17,8 @@ Additionally a list of any non-Red Hat RPM packages that were installed on the s | reboot_timeout | 7200 | Integer for maximum seconds to wait for reboot to complete. | | upgrade_timeout | 14400 | Integer for maximum seconds to wait for reboot to complete during upgrade reboot. | | post_reboot_delay | 120 | Integer to pass to the reboot post_reboot_delay option. | +| leapp_resume_retries | 360 | Integer for maximum retries to wait for leapp_resume service no longer exists. | +| leapp_resume_delay | 10 | Integer for seconds between each attempt to check leapp_resume service no longer exists. | | update_grub_to_grub_2 | false | Boolean to control whether grub gets upgraded to grub 2 in post RHEL 6 to 7 upgrade. | | os_path | $PATH | Variable used to override the default $PATH environmental variable on the target node | async_timeout_maximum | 7200 | Variable used to set the asynchronous task timeout value (in seconds) diff --git a/roles/upgrade/defaults/main.yml b/roles/upgrade/defaults/main.yml index 4dc63ce..4e185b4 100644 --- a/roles/upgrade/defaults/main.yml +++ b/roles/upgrade/defaults/main.yml @@ -124,6 +124,9 @@ reboot_timeout: 7200 upgrade_timeout: 14400 post_reboot_delay: 120 +leapp_resume_retries: 360 +leapp_resume_delay: 10 + os_path: $PATH async_timeout_maximum: 7200 diff --git a/roles/upgrade/tasks/leapp-upgrade.yml b/roles/upgrade/tasks/leapp-upgrade.yml index cdc6aa8..7210dbf 100644 --- a/roles/upgrade/tasks/leapp-upgrade.yml +++ b/roles/upgrade/tasks/leapp-upgrade.yml @@ -113,8 +113,8 @@ register: leapp_resume_result ignore_errors: true until: leapp_resume_result.failed - retries: 360 - delay: 10 + retries: "{{ leapp_resume_retries }}" + delay: "{{ leapp_resume_delay }}" - name: leapp-upgrade | Block to handle grub_boot_device option when: grub_boot_device is defined