From 3ce0c63b13d7fad11725c4699a07d268e17ff490 Mon Sep 17 00:00:00 2001 From: Lukas Bezdicka Date: Wed, 11 Nov 2020 19:14:23 +0100 Subject: [PATCH] Enable tripleo_free strategy for upgrade 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 (cherry picked from commit 735faf0478bf1e5d0687583337079792cc7f1dff) --- common/deploy-steps.j2 | 3 +++ .../tripleo-packages/tripleo-packages-baremetal-puppet.yaml | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2 index 95891bb42c..b732ccf95d 100644 --- a/common/deploy-steps.j2 +++ b/common/deploy-steps.j2 @@ -940,6 +940,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 %}" @@ -979,6 +980,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 @@ -1006,6 +1008,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 diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml index 170b96f1a1..7c3c97d284 100644 --- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml +++ b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml @@ -213,10 +213,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