Browse Source

Merge "Only enable leapp tasks when distribution is correct" into stable/ussuri

changes/15/735815/1
Zuul 3 weeks ago
committed by Gerrit Code Review
parent
commit
1d1587d5ce
1 changed files with 18 additions and 3 deletions
  1. +18
    -3
      deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml

+ 18
- 3
deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml View File

@@ -119,14 +119,29 @@ outputs:
step_config: |
include tripleo::packages
upgrade_tasks:
- name: set leapp facts
tags: always
- name: Gather missing facts
setup:
gather_subset: "distribution"
when: >-
ansible_facts['distribution'] is not defined or
ansible_facts['distribution_major_version'] is not defined
tags:
- always

- name: Set leapp facts
set_fact:
upgrade_leapp_enabled: {get_param: UpgradeLeappEnabled}
upgrade_leapp_enabled: >-
{{ _upgradeLeappEnabled | bool and
ansible_facts['distribution'] == 'RedHat' and
ansible_facts['distribution_major_version'] is version('7', '==') }}
upgrade_leapp_debug: {get_param: UpgradeLeappDebug}
upgrade_leapp_devel_skip: {get_param: UpgradeLeappDevelSkip}
upgrade_leapp_command_options: {get_param: UpgradeLeappCommandOptions}
upgrade_leapp_reboot_timeout: {get_param: UpgradeLeappRebootTimeout}
vars:
_upgradeLeappEnabled: {get_param: UpgradeLeappEnabled}
tags:
- always

- name: system_upgrade_prepare step 3
tags:


Loading…
Cancel
Save