Add option to skip the update/reboot on pre-upgraded server

redhat-cop · Oct 4, 2024 · be90221 · be90221
1 parent 9dcb2e9
commit be90221
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/changelogs/fragments/option_to_skip_pre_upgrade_update_boot.yml b/changelogs/fragments/option_to_skip_pre_upgrade_update_boot.yml
@@ -0,0 +1,2 @@
+minor_changes:
+- Add option to skip the initial update and reboot of the pre-upgraded server
diff --git a/roles/upgrade/README.md b/roles/upgrade/README.md
@@ -30,6 +30,7 @@ Additionally a list of any non-Red Hat RPM packages that were installed on the s
 | kernel_modules_to_unload_before_upgrade | []    | A list of kernel modules to be unloaded prior to running leapp. |
 | post_7_to_8_python_interpreter | /usr/libexec/platform-python | For RHEL 7 to 8 upgrades, /usr/bin/python is discovered but not available post upgrade. For 7 to 8 upgrades, ansible_python_interpreter is set to this value post upgrade reboot prior to reconnecting. |
 | infra_leapp_upgrade_system_roles_collection | fedora.linux_system_roles | Can be one of:<br>- 'fedora.linux_system_roles'<br>- 'redhat.rhel_system_roles' |
+| skip_pre_upgrade_update_reboot | false          | Skip the initial update and reboot on the running pre-upgrade operating system |
 
 
 ## Satellite variables

diff --git a/roles/upgrade/defaults/main.yml b/roles/upgrade/defaults/main.yml
@@ -113,6 +113,9 @@ crypto_policy: DEFAULT
 # crypto_policy: FUTURE
 # crypto_policy: DEFAULT:SHA1
 
+# Whether or not to skip the pre upgrade update and reboot of the operating system
+skip_pre_upgrade_update_reboot: false
+
 # Whether or not to update from legacy grub to grub2 in post-upgrade steps from RHEL 6 -> 7.
 update_grub_to_grub_2: false
 post_upgrade_update: true

diff --git a/roles/upgrade/tasks/leapp-upgrade.yml b/roles/upgrade/tasks/leapp-upgrade.yml
@@ -29,6 +29,7 @@
 
 - name: leapp-upgrade | Include update-and-reboot.yml
   ansible.builtin.include_tasks: update-and-reboot.yml
+  when: skip_pre_upgrade_update_reboot is not defined or not skip_pre_upgrade_update_reboot|bool
 
 - name: leapp-upgrade | Create /etc/leapp/files/leapp_upgrade_repositories.repo
   ansible.builtin.yum_repository:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		minor_changes:
		- Add option to skip the initial update and reboot of the pre-upgraded server