Merge "Allow the execution of leapp without RHSM subscription."

This commit is contained in:
Zuul 2019-08-27 16:36:45 +00:00 committed by Gerrit Code Review
commit f8031bcbf7
2 changed files with 8 additions and 2 deletions

View File

@ -254,5 +254,9 @@ roles_upgrade_order: '__undefined__'
# Packet loss threshold for a ping test
loss_threshold: 1
# Run leapp upgrade without RHSM subscription
# Requires workarounds being applied.
leapp_unsubscribed: false
# Leapp OS upgrade variables
leapp_unregister: true

View File

@ -41,7 +41,7 @@
- name: Run leapp upgrade (download packages)
shell: |
set -o pipefail
leapp upgrade --debug 2>&1 | \
{{ 'LEAPP_DEVEL_SKIP_RHSM=1 sudo -E' if leapp_unsubscribed|bool and upgrade_workarounds|bool }} leapp upgrade --debug 2>&1 | \
tee {{ working_dir }}/undercloud_leapp_upgrade.log
- name: Reboot the undercloud
@ -50,4 +50,6 @@
- name: Unregister the node once the OS was upgraded if desired
redhat_subscription:
state: absent
when: leapp_unregister|bool
when:
- leapp_unregister|bool
- not leapp_unsubscribed|bool