openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Enable tripleo_free strategy for upgrade" into stable/ussuri

This commit is contained in:
Zuul 2020-12-23 19:09:29 +00:00 committed by Gerrit Code Review
parent 581d3ae3a2 2d478acc36
commit 61623ef5a8
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/deploy-steps.j2
View File

@ -924,6 +924,7 @@ outputs:
deploy_target_host: "DEPLOY_TARGET_HOST"
{%- for step in range(0,upgrade_steps_max) %}
- hosts: DEPLOY_TARGET_HOST
strategy: tripleo_free
name: Upgrade tasks for step {{step}}
become: true
gather_facts: "{% raw %}{{ gather_facts | default(false) }}{% endraw %}"
@ -963,6 +964,7 @@ outputs:
deploy_source_host: "DEPLOY_SOURCE_HOST"
deploy_target_host: "DEPLOY_TARGET_HOST"
- hosts: DEPLOY_TARGET_HOST
strategy: tripleo_free
any_errors_fatal: yes
tasks:
- include_tasks: post_upgrade_steps_tasks.yaml
@ -990,6 +992,7 @@ outputs:
deploy_target_host: "DEPLOY_TARGET_HOST"
{%- for step in range(external_upgrade_steps_max) %}
- hosts: DEPLOY_SOURCE_HOST
strategy: tripleo_free
name: External upgrade step {{step}}
gather_facts: "{% raw %}{{ gather_facts | default(false) }}{% endraw %}"
any_errors_fatal: yes

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

@ -203,10 +203,6 @@ outputs:
- name: reboot to perform the upgrade
reboot:
reboot_timeout: "{{upgrade_leapp_reboot_timeout}}"
- name: Clear gathered facts from all currently targeted hosts
meta: clear_facts
- name: Force facts refresh after OS upgrade to refresh cache.
setup:
- name: Package and repo update tasks
when: step|int == 0