openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Force facts cache refreshing before upgrade." into stable/train

This commit is contained in:
Zuul 2020-01-25 04:54:28 +00:00 committed by Gerrit Code Review
parent 2ccc8c6f77 f632ea38ac
commit 289c20712c
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
common/deploy-steps.j2
View File

@ -1231,16 +1231,14 @@ outputs:
BOOTSTRAP_SERVER_ID: {get_attr: [BootstrapServerId, value]} BOOTSTRAP_SERVER_ID: {get_attr: [BootstrapServerId, value]}
ENABLE_DEBUG: {get_param: ConfigDebug} ENABLE_DEBUG: {get_param: ConfigDebug}
template: | template: |
- hosts: DEPLOY_SOURCE_HOST - hosts: DEPLOY_SOURCE_HOST:DEPLOY_TARGET_HOST
name: Gather facts from undercloud name: Gather facts from undercloud
gather_facts: yes gather_facts: no
become: false become: false
tags: always tags: always
tasks:
- hosts: DEPLOY_TARGET_HOST - name: Force facts refresh before upgrade.
name: Gather facts from overcloud setup:
gather_facts: yes
tags: always
- hosts: all - hosts: all
name: Load global variables name: Load global variables
@ -1495,23 +1493,19 @@ outputs:
CONTAINER_CLI: {get_param: ContainerCli} CONTAINER_CLI: {get_param: ContainerCli}
CONTAINER_LOG_STDOUT_PATH: {get_param: ContainerLogStdoutPath} CONTAINER_LOG_STDOUT_PATH: {get_param: ContainerLogStdoutPath}
template: | template: |
- hosts: DEPLOY_SOURCE_HOST
name: Gather facts from undercloud
gather_facts: yes
become: false
tags:
- always
- facts
# Collect the facts from the overcloud nodes but ignore unreachable # Collect the facts from the overcloud nodes but ignore unreachable
# nodes in the case of a dead node which needs to be part of the # nodes in the case of a dead node which needs to be part of the
# scale-down operation. # scale-down operation.
- hosts: DEPLOY_TARGET_HOST - hosts: DEPLOY_SOURCE_HOST:DEPLOY_TARGET_HOST
name: Gather facts from overcloud name: Gather facts from overcloud
gather_facts: yes gather_facts: no
ignore_unreachable: True ignore_unreachable: True
tags: tags:
- always - always
- facts - facts
tasks:
- name: Force facts refresh before scale.
setup:
- hosts: all - hosts: all
name: Load global variables name: Load global variables
gather_facts: {{ '"{{' }} gather_facts | default(false) {{ '}}"' }} gather_facts: {{ '"{{' }} gather_facts | default(false) {{ '}}"' }}