openstack/tripleo-heat-templates
Code Issues Proposed changes

Enable tripleo_free strategy for upgrade

Browse Source 
The tripleo_free startegy cuts the run time of composable upgrade.
But as each node gets to different point of code there is need to
remove clear_facts part from tripleo-packages. The clear_facts
applies globaly meaning if messaging node looks for distribution
fact while controller runs clear_facts we will fail. The
clear_facts was added to force ansible to reset the
ansible_python_interpreter. This should be avoided by simply
setting default python by alternatives command and it's irelevant
to any other version than stable/train.

Change-Id: I556327228f23eb5e744b580618fb581a9fd2ce41
This commit is contained in:
Lukas Bezdicka 2020-11-11 19:14:23 +01:00
parent b289ef4f4c
commit 735faf0478
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

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

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

@ -206,10 +206,6 @@ outputs:
- name: reboot to perform the upgrade - name: reboot to perform the upgrade
reboot: reboot:
reboot_timeout: "{{upgrade_leapp_reboot_timeout}}" 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 - name: Package and repo update tasks
when: step|int == 0 when: step|int == 0