openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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

This commit is contained in:
Zuul 2021-01-15 14:23:16 +00:00 committed by Gerrit Code Review
parent 080ffcfdd1 73eb352555
commit 902a41a63d
2 changed files with 5 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

@ -934,6 +934,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 %}"
@ -973,6 +974,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
@ -1001,6 +1003,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

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

@ -312,11 +312,9 @@ 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: Set the python to python3
vars:
ansible_python_interpreter: "/usr/bin/python3"
shell: alternatives --set python /usr/bin/python3
- name: Package and repo update tasks