openstack/tripleo-heat-templates
Code Issues Proposed changes

Add common vars to common plays

Browse Source 
We should pass in the common vars to all the common plays in
deploy-steps.j2 so that tasks will have them available. Some of these
parameter driven variables were never actually wired up, so they didn't
work to begin with (such as enable_puppet/enable_debug).

Change-Id: I830e1ae21fe3e278a5f7591065d066c0a6883a9a
Closes-Bug: #1785635
This commit is contained in:
James Slagle 2018-10-25 08:26:16 -04:00 committed by Bogdan Dobrelya
parent 5aa10d18ed
commit 5a5ad11d0b
1 changed files with 32 additions and 1 deletions

33
common/deploy-steps.j2

@ -475,6 +475,12 @@ outputs:
vars:
bootstrap_server_id: BOOTSTRAP_SERVER_ID
step: 0
update_identifier: UPDATE_IDENTIFIER
enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET
container_cli: CONTAINER_CLI
docker_puppet_debug: DOCKER_PUPPET_DEBUG
docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT
tasks:
{%- for role in roles %}
- import_tasks: {{role.name}}/deploy_steps_tasks.yaml
@ -503,6 +509,12 @@ outputs:
any_errors_fatal: yes
vars:
bootstrap_server_id: BOOTSTRAP_SERVER_ID
update_identifier: UPDATE_IDENTIFIER
enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET
container_cli: CONTAINER_CLI
docker_puppet_debug: DOCKER_PUPPET_DEBUG
docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT
tasks:
{%- for role in roles %}
- import_tasks: {{role.name}}/host_prep_tasks.yaml
@ -520,7 +532,14 @@ outputs:
any_errors_fatal: yes
become: false
vars:
bootstrap_server_id: BOOTSTRAP_SERVER_ID
step: '{{step}}'
update_identifier: UPDATE_IDENTIFIER
enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET
container_cli: CONTAINER_CLI
docker_puppet_debug: DOCKER_PUPPET_DEBUG
docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT
tasks:
- import_tasks: external_deploy_steps_tasks.yaml
tags:
@ -561,8 +580,12 @@ outputs:
vars:
bootstrap_server_id: BOOTSTRAP_SERVER_ID
step: '{{step}}'
container_cli: CONTAINER_CLI
update_identifier: UPDATE_IDENTIFIER
enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET
container_cli: CONTAINER_CLI
docker_puppet_debug: DOCKER_PUPPET_DEBUG
docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT
tasks:
- name: Check if /var/lib/docker-container-startup-configs.json already exists
stat:
@ -595,6 +618,14 @@ outputs:
gather_facts: no
any_errors_fatal: yes
become: false
vars:
bootstrap_server_id: BOOTSTRAP_SERVER_ID
update_identifier: UPDATE_IDENTIFIER
enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET
container_cli: CONTAINER_CLI
docker_puppet_debug: DOCKER_PUPPET_DEBUG
docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT
tasks:
- import_tasks: external_post_deploy_steps_tasks.yaml
tags: