From 1dc7be85bbeab9e979a3462a89c192e7933836d3 Mon Sep 17 00:00:00 2001 From: Sergii Golovatiuk Date: Tue, 26 Jan 2021 02:00:54 +0100 Subject: [PATCH] Add post delay to reboot Leapp may reconfigure network after main upgrade. Also systemd may bring down and up again network unit. This patch adds post_reboot_delay as 2 min to mitigate such issues which can be configurable as heat variable in customers env files for some very specific cases. Also test_command is changed from whoami to systemctl to have better assesment when a system completed its boot. Closes-Bug: rhbz#1920293 Change-Id: Iaa6fdef24599072f5a31c1fd2da29c276399c83d (cherry picked from commit a9bf1c1285ebb54844018b9f18ed8089fbc30a3f) --- .../tripleo-packages-baremetal-puppet.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml index bcdec6a8b4..b6590de51c 100644 --- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml +++ b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml @@ -59,6 +59,12 @@ parameters: description: Timeout (seconds) for the OS upgrade phase via Leapp type: number default: 3600 + UpgradeLeappPostRebootDelay: + description: | + Maximum (seconds) to wait for machine to reboot and respond to a test + command. + type: number + default: 120 UpgradeLeappToRemove: default: [] description: List of packages to remove during Leapp upgrade. @@ -131,6 +137,7 @@ outputs: upgrade_leapp_devel_skip: {get_param: UpgradeLeappDevelSkip} upgrade_leapp_command_options: {get_param: UpgradeLeappCommandOptions} upgrade_leapp_reboot_timeout: {get_param: UpgradeLeappRebootTimeout} + upgrade_leapp_post_reboot_delay: {get_param: UpgradeLeappPostRebootDelay} vars: _upgradeLeappEnabled: {get_param: UpgradeLeappEnabled} tags: @@ -213,6 +220,9 @@ outputs: - name: reboot to perform the upgrade reboot: reboot_timeout: "{{upgrade_leapp_reboot_timeout}}" + test_command: >- + systemctl is-system-running | grep -e running -e degraded + post_reboot_delay: "{{ upgrade_leapp_post_reboot_delay }}" - name: Package and repo update tasks when: step|int == 0