Replace confusing usage of update_identifier

We use update_identifier ansible variable to check if we need to
re-run deployment tasks. Though there is no bug as we use
DeployIdentifier heat param for it, it's little confusing
(UpdateIdentifier was meant for package updates).

This also removes usage of UpdateIdentifier/update_identifier in
all_nodes_config.j2.yaml. We can deprecate/remove the heat param in a
subsequent patch.

Change-Id: I36ed62ae605a2d8f8f139b50646144b143d5e5f4
This commit is contained in:
Rabi Mishra 2018-12-10 16:35:04 +05:30
parent 8f5b24de22
commit c2aeb45e38
2 changed files with 11 additions and 12 deletions

View File

@ -132,7 +132,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
@ -340,7 +340,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}
@ -383,7 +383,7 @@ resources:
properties:
servers: {get_param: servers}
input_values:
update_identifier: {get_param: DeployIdentifier}
deploy_identifier: {get_param: DeployIdentifier}
{% endfor %}
@ -403,7 +403,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}
@ -449,7 +449,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
@ -488,7 +488,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
@ -514,7 +514,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
@ -538,7 +538,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
@ -562,7 +562,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
@ -576,7 +576,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
@ -603,7 +603,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

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}