openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Replace include_tasks with import_tasks" into stable/stein

This commit is contained in:
Zuul 2019-09-06 19:18:21 +00:00 committed by Gerrit Code Review
parent 1899678b1b 1110b75378
commit 11262ef5e6
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
common/deploy-steps.j2
View File

@ -606,13 +606,15 @@ outputs:
- include_vars: global_vars.yaml - include_vars: global_vars.yaml
tags: tags:
- always - always
{%- for step in range(external_update_steps_max) %}
- hosts: DEPLOY_SOURCE_HOST - hosts: DEPLOY_SOURCE_HOST
name: External update steps name: External update step {{step}}
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: vars:
bootstrap_server_id: BOOTSTRAP_SERVER_ID bootstrap_server_id: BOOTSTRAP_SERVER_ID
step: '{{step}}'
deploy_identifier: DEPLOY_IDENTIFIER deploy_identifier: DEPLOY_IDENTIFIER
enable_debug: ENABLE_DEBUG enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET enable_puppet: ENABLE_PUPPET
@ -623,24 +625,24 @@ outputs:
docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT
docker_puppet_mount_host_puppet: DOCKER_PUPPET_MOUNT_HOST_PUPPET docker_puppet_mount_host_puppet: DOCKER_PUPPET_MOUNT_HOST_PUPPET
tasks: tasks:
- include_tasks: external_update_steps_tasks.yaml - import_tasks: external_update_steps_tasks.yaml
with_sequence: start=0 end={{external_update_steps_max-1}}
loop_control:
loop_var: step
tags: always
tags: tags:
- step{{step}}
- external - external
- external_update_steps - external_update_steps
{%- endfor %}
{%- for step in range(1,deploy_steps_max) %}
# putting both update and deploy tasks in the same # putting both update and deploy tasks in the same
# playbook allows influencing the deploy tasks by # playbook allows influencing the deploy tasks by
# variables "exported" from update tasks # variables "exported" from update tasks
- hosts: DEPLOY_SOURCE_HOST - hosts: DEPLOY_SOURCE_HOST
name: External deploy steps name: External deploy step {{step}}
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: vars:
bootstrap_server_id: BOOTSTRAP_SERVER_ID bootstrap_server_id: BOOTSTRAP_SERVER_ID
step: '{{step}}'
deploy_identifier: DEPLOY_IDENTIFIER deploy_identifier: DEPLOY_IDENTIFIER
enable_debug: ENABLE_DEBUG enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET enable_puppet: ENABLE_PUPPET
@ -651,14 +653,12 @@ outputs:
docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT
docker_puppet_mount_host_puppet: DOCKER_PUPPET_MOUNT_HOST_PUPPET docker_puppet_mount_host_puppet: DOCKER_PUPPET_MOUNT_HOST_PUPPET
tasks: tasks:
- include_tasks: external_deploy_steps_tasks.yaml - import_tasks: external_deploy_steps_tasks.yaml
with_sequence: start=1 end={{deploy_steps_max-1}}
loop_control:
loop_var: step
tags: always
tags: tags:
- step{{step}}
- external - external
- external_deploy_steps - external_deploy_steps
{%- endfor %}
pre_upgrade_rolling_steps_tasks: | pre_upgrade_rolling_steps_tasks: |
{%- for role in roles %} {%- for role in roles %}
- import_tasks: {{role.name}}/pre_upgrade_rolling_tasks.yaml - import_tasks: {{role.name}}/pre_upgrade_rolling_tasks.yaml
@ -832,8 +832,9 @@ outputs:
- include_vars: global_vars.yaml - include_vars: global_vars.yaml
tags: tags:
- always - always
{%- for step in range(external_upgrade_steps_max) %}
- hosts: DEPLOY_SOURCE_HOST - hosts: DEPLOY_SOURCE_HOST
name: External upgrade name: External upgrade step {{step}}
gather_facts: {{ '"{{' }} gather_facts | default(false) {{ '}}"' }} gather_facts: {{ '"{{' }} gather_facts | default(false) {{ '}}"' }}
any_errors_fatal: yes any_errors_fatal: yes
become: false become: false
@ -841,6 +842,7 @@ outputs:
# Explicit ansible_python_interpreter to allow connecting # Explicit ansible_python_interpreter to allow connecting
# to different OS releases (EL7/8) while using delegate_to. # to different OS releases (EL7/8) while using delegate_to.
ansible_python_interpreter: /usr/libexec/platform-python ansible_python_interpreter: /usr/libexec/platform-python
step: '{{step}}'
bootstrap_server_id: BOOTSTRAP_SERVER_ID bootstrap_server_id: BOOTSTRAP_SERVER_ID
deploy_identifier: DEPLOY_IDENTIFIER deploy_identifier: DEPLOY_IDENTIFIER
enable_debug: ENABLE_DEBUG enable_debug: ENABLE_DEBUG
@ -852,19 +854,18 @@ outputs:
docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT
docker_puppet_mount_host_puppet: DOCKER_PUPPET_MOUNT_HOST_PUPPET docker_puppet_mount_host_puppet: DOCKER_PUPPET_MOUNT_HOST_PUPPET
tasks: tasks:
- include_tasks: external_upgrade_steps_tasks.yaml - import_tasks: external_upgrade_steps_tasks.yaml
with_sequence: start=0 end={{external_upgrade_steps_max-1}}
loop_control:
loop_var: step
tags: always
tags: tags:
- step{{step}}
- external - external
- external_upgrade_steps - external_upgrade_steps
{%- endfor %}
{%- for step in range(1,deploy_steps_max) %}
# putting both upgrade and deploy tasks in the same # putting both upgrade and deploy tasks in the same
# playbook allows influencing the deploy tasks by # playbook allows influencing the deploy tasks by
# variables "exported" from upgrade tasks # variables "exported" from upgrade tasks
- hosts: DEPLOY_SOURCE_HOST - hosts: DEPLOY_SOURCE_HOST
name: External deploy steps name: External deploy step {{step}}
gather_facts: {{ '"{{' }} gather_facts | default(false) {{ '}}"' }} gather_facts: {{ '"{{' }} gather_facts | default(false) {{ '}}"' }}
any_errors_fatal: yes any_errors_fatal: yes
become: false become: false
@ -872,6 +873,7 @@ outputs:
# Explicit ansible_python_interpreter to allow connecting # Explicit ansible_python_interpreter to allow connecting
# to different OS releases (EL7/8) while using delegate_to. # to different OS releases (EL7/8) while using delegate_to.
ansible_python_interpreter: /usr/libexec/platform-python ansible_python_interpreter: /usr/libexec/platform-python
step: '{{step}}'
bootstrap_server_id: BOOTSTRAP_SERVER_ID bootstrap_server_id: BOOTSTRAP_SERVER_ID
deploy_identifier: DEPLOY_IDENTIFIER deploy_identifier: DEPLOY_IDENTIFIER
enable_debug: ENABLE_DEBUG enable_debug: ENABLE_DEBUG
@ -883,14 +885,12 @@ outputs:
docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT
docker_puppet_mount_host_puppet: DOCKER_PUPPET_MOUNT_HOST_PUPPET docker_puppet_mount_host_puppet: DOCKER_PUPPET_MOUNT_HOST_PUPPET
tasks: tasks:
- include_tasks: external_deploy_steps_tasks.yaml - import_tasks: external_deploy_steps_tasks.yaml
with_sequence: start=1 end={{deploy_steps_max-1}} tags:
loop_control: - step{{step}}
loop_var: step
tags: always
tags:
- external - external
- external_deploy_steps - external_deploy_steps
{%- endfor %}
fast_forward_upgrade_playbook: fast_forward_upgrade_playbook:
str_replace: str_replace:
params: params: