openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Parametrize UpgradeLeappDevelSkip to pass multiple env variables." into stable/stein

This commit is contained in:
Zuul 2019-08-27 18:53:34 +00:00 committed by Gerrit Code Review
parent 3151e73c29 ffb63dfecc
commit 1239e5a68c
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
View File

@ -59,10 +59,12 @@ parameters:
description: Print debugging output when running Leapp
type: boolean
default: true
UpgradeLeappDevelSkipRhsm:
description: Skip RHSM when running Leapp in development/testing.
type: boolean
default: false
UpgradeLeappDevelSkip:
description: |
Skip Leapp checks by setting env variables when running Leapp in
development/testing. For example, LEAPP_DEVEL_SKIP_RHSM=1.
type: string
default: ''
UpgradeLeappRebootTimeout:
description: Timeout (seconds) for the OS upgrade phase via Leapp
type: number
@ -97,7 +99,7 @@ outputs:
set_fact:
upgrade_leapp_enabled: {get_param: UpgradeLeappEnabled}
upgrade_leapp_debug: {get_param: UpgradeLeappDebug}
upgrade_leapp_devel_skip_rhsm: {get_param: UpgradeLeappDevelSkipRhsm}
upgrade_leapp_devel_skip: {get_param: UpgradeLeappDevelSkip}
upgrade_leapp_reboot_timeout: {get_param: UpgradeLeappRebootTimeout}
- name: system_upgrade_prepare step 3
@ -133,7 +135,7 @@ outputs:
block:
- name: run leapp upgrade (download packages)
shell: >
{% if upgrade_leapp_devel_skip_rhsm|default(false) %}LEAPP_DEVEL_SKIP_RHSM=1{% endif %}
{% if upgrade_leapp_devel_skip|default(false) %}{{ upgrade_leapp_devel_skip }}{% endif %}
leapp upgrade
{% if upgrade_leapp_debug|default(true) %}--debug{% endif %}
when: upgrade_leapp_enabled