openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Replace confusing usage of update_identifier"

Browse Source
This commit is contained in:
Zuul 2018-12-20 01:51:14 +00:00 committed by Gerrit Code Review
commit 795dfcfdce
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
common/deploy-steps.j2
View File

@ -145,7 +145,7 @@ resources:
inputs:
- name: step
- name: tripleo_role_name
- name: update_identifier
- name: deploy_identifier
- name: bootstrap_server_id
- name: enable_debug
- name: enable_puppet
@ -355,7 +355,7 @@ resources:
input_values:
step: {{step}}
tripleo_role_name: {{role.name}}
update_identifier: {get_param: DeployIdentifier}
deploy_identifier: {get_param: DeployIdentifier}
bootstrap_server_id: {get_attr: [BootstrapServerId, value]}
enable_debug: {get_param: ConfigDebug}
enable_puppet: {get_param: EnablePuppet}
@ -400,7 +400,7 @@ resources:
properties:
servers: {get_param: servers}
input_values:
update_identifier: {get_param: DeployIdentifier}
deploy_identifier: {get_param: DeployIdentifier}
{% endfor %}
@ -420,7 +420,7 @@ outputs:
BOOTSTRAP_SERVER_ID: {get_attr: [BootstrapServerId, value]}
DEPLOY_SOURCE_HOST: {get_param: deployment_source_hosts}
DEPLOY_TARGET_HOST: {get_param: deployment_target_hosts}
UPDATE_IDENTIFIER: {get_param: DeployIdentifier}
DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
ENABLE_DEBUG: {get_param: ConfigDebug}
ENABLE_PUPPET: {get_param: EnablePuppet}
CONTAINER_CLI: {get_param: ContainerCli}
@ -466,7 +466,7 @@ outputs:
vars:
bootstrap_server_id: BOOTSTRAP_SERVER_ID
step: 0
update_identifier: UPDATE_IDENTIFIER
deploy_identifier: DEPLOY_IDENTIFIER
enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET
container_cli: CONTAINER_CLI
@ -505,7 +505,7 @@ outputs:
any_errors_fatal: yes
vars:
bootstrap_server_id: BOOTSTRAP_SERVER_ID
update_identifier: UPDATE_IDENTIFIER
deploy_identifier: DEPLOY_IDENTIFIER
enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET
container_cli: CONTAINER_CLI
@ -531,7 +531,7 @@ outputs:
vars:
bootstrap_server_id: BOOTSTRAP_SERVER_ID
step: '{{step}}'
update_identifier: UPDATE_IDENTIFIER
deploy_identifier: DEPLOY_IDENTIFIER
enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET
container_cli: CONTAINER_CLI
@ -555,7 +555,7 @@ outputs:
vars:
bootstrap_server_id: BOOTSTRAP_SERVER_ID
step: '{{step}}'
update_identifier: UPDATE_IDENTIFIER
deploy_identifier: DEPLOY_IDENTIFIER
enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET
container_cli: CONTAINER_CLI
@ -579,7 +579,7 @@ outputs:
vars:
bootstrap_server_id: BOOTSTRAP_SERVER_ID
step: '{{step}}'
update_identifier: UPDATE_IDENTIFIER
deploy_identifier: DEPLOY_IDENTIFIER
enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET
container_cli: CONTAINER_CLI
@ -593,7 +593,7 @@ outputs:
register: docker_container_startup_configs_json_stat
- import_tasks: common_deploy_steps_tasks.yaml
when:
- ((update_identifier is defined and update_identifier != "" and update_identifier is not none) or not docker_container_startup_configs_json_stat.stat.exists)
- ((deploy_identifier is defined and deploy_identifier != "" and deploy_identifier is not none) or not docker_container_startup_configs_json_stat.stat.exists)
tags:
- overcloud
- deploy_steps
@ -620,7 +620,7 @@ outputs:
become: false
vars:
bootstrap_server_id: BOOTSTRAP_SERVER_ID
update_identifier: UPDATE_IDENTIFIER
deploy_identifier: DEPLOY_IDENTIFIER
enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET
container_cli: CONTAINER_CLI

1
puppet/all-nodes-config.j2.yaml
View File

@ -147,7 +147,6 @@ resources:
- ','
- {get_param: cellv2_discovery_hosts}
deploy_identifier: {get_param: DeployIdentifier}
update_identifier: {get_param: UpdateIdentifier}
stack_action: {get_param: StackAction}
stack_update_type: {get_param: StackUpdateType}