Skip to content

Commit

Permalink
Added variables for leapp_resume task (#217)
Browse files Browse the repository at this point in the history
  • Loading branch information
dmnagornyi committed Aug 20, 2024
1 parent 10e7ab0 commit ad05898
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 2 deletions.
4 changes: 4 additions & 0 deletions changelogs/fragments/add_leapp_resume_variables.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
minor_changes:
- Added variables to the leapp_resume task to control task retries and delays.
...
2 changes: 2 additions & 0 deletions roles/upgrade/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions roles/upgrade/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions roles/upgrade/tasks/leapp-upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ad05898

Please sign in to comment.