openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Add tags always into external update tasks." into stable/stein

This commit is contained in:
Zuul 2019-08-27 12:05:11 +00:00 committed by Gerrit Code Review
parent 2c7d6ec8c5 54051f5ecc
commit 96443f9c47
1 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
common/deploy-steps.j2
View File

@ -575,6 +575,16 @@ outputs:
params: params:
DEPLOY_SOURCE_HOST: {get_param: deployment_source_hosts} DEPLOY_SOURCE_HOST: {get_param: deployment_source_hosts}
DEPLOY_TARGET_HOST: {get_param: deployment_target_hosts} DEPLOY_TARGET_HOST: {get_param: deployment_target_hosts}
DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
BOOTSTRAP_SERVER_ID: {get_attr: [BootstrapServerId, value]}
ENABLE_DEBUG: {get_param: ConfigDebug}
ENABLE_PUPPET: {get_param: EnablePuppet}
DOCKER_PUPPET_DEBUG: {get_param: DockerPuppetDebug}
DOCKER_PUPPET_PROCESS_COUNT: {get_param: DockerPuppetProcessCount}
DOCKER_PUPPET_MOUNT_HOST_PUPPET: {get_param: DockerPuppetMountHostPuppet}
CONTAINER_CLI: {get_param: ContainerCli}
CONTAINER_LOG_STDOUT_PATH: {get_param: ContainerLogStdoutPath}
CONTAINER_HEALTHCHECK_DISABLED: {get_param: ContainerHealthcheckDisabled}
template: | template: |
- hosts: DEPLOY_SOURCE_HOST - hosts: DEPLOY_SOURCE_HOST
name: Gather facts from undercloud name: Gather facts from undercloud
@ -602,11 +612,23 @@ outputs:
gather_facts: {{ '"{{' }} gather_facts | default(false) {{ '}}"' }} gather_facts: {{ '"{{' }} gather_facts | default(false) {{ '}}"' }}
any_errors_fatal: yes any_errors_fatal: yes
become: false become: false
vars:
bootstrap_server_id: BOOTSTRAP_SERVER_ID
deploy_identifier: DEPLOY_IDENTIFIER
enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET
container_cli: CONTAINER_CLI
container_log_stdout_path: CONTAINER_LOG_STDOUT_PATH
container_healthcheck_disabled: CONTAINER_HEALTHCHECK_DISABLED
docker_puppet_debug: DOCKER_PUPPET_DEBUG
docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT
docker_puppet_mount_host_puppet: DOCKER_PUPPET_MOUNT_HOST_PUPPET
tasks: tasks:
- include_tasks: external_update_steps_tasks.yaml - include_tasks: external_update_steps_tasks.yaml
with_sequence: start=0 end={{external_update_steps_max-1}} with_sequence: start=0 end={{external_update_steps_max-1}}
loop_control: loop_control:
loop_var: step loop_var: step
tags: always
tags: tags:
- external - external
- external_update_steps - external_update_steps
@ -618,11 +640,23 @@ outputs:
gather_facts: {{ '"{{' }} gather_facts | default(false) {{ '}}"' }} gather_facts: {{ '"{{' }} gather_facts | default(false) {{ '}}"' }}
any_errors_fatal: yes any_errors_fatal: yes
become: false become: false
vars:
bootstrap_server_id: BOOTSTRAP_SERVER_ID
deploy_identifier: DEPLOY_IDENTIFIER
enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET
container_cli: CONTAINER_CLI
container_log_stdout_path: CONTAINER_LOG_STDOUT_PATH
container_healthcheck_disabled: CONTAINER_HEALTHCHECK_DISABLED
docker_puppet_debug: DOCKER_PUPPET_DEBUG
docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT
docker_puppet_mount_host_puppet: DOCKER_PUPPET_MOUNT_HOST_PUPPET
tasks: tasks:
- include_tasks: external_deploy_steps_tasks.yaml - include_tasks: external_deploy_steps_tasks.yaml
with_sequence: start=1 end={{deploy_steps_max-1}} with_sequence: start=1 end={{deploy_steps_max-1}}
loop_control: loop_control:
loop_var: step loop_var: step
tags: always
tags: tags:
- external - external
- external_deploy_steps - external_deploy_steps