openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Make Deploy/UpdateIdentifier definition semi-consistent"

Browse Source
This commit is contained in:
Jenkins 2017-07-22 07:55:10 +00:00 committed by Gerrit Code Review
commit bb963cfe42
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extraconfig/post_deploy/example_run_on_update.yaml
View File

@ -14,6 +14,9 @@ parameters:
# otherwise unchanged
DeployIdentifier:
type: string
default: ''
description: >
Setting this to a unique value will re-run any deployment tasks which perform configuration on a Heat stack-update.
resources:

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

@ -45,6 +45,7 @@ parameters:
perform configuration on a Heat stack-update.
UpdateIdentifier:
type: string
default: ''
description: >
Setting to a previously unused value during stack-update will trigger
package update on all nodes

1
puppet/major_upgrade_steps.j2.yaml
View File

@ -18,6 +18,7 @@ parameters:
type: json
UpdateIdentifier:
type: string
default: ''
description: >
Setting to a previously unused value during stack-update will trigger
the Upgrade resources to re-run on all roles.

5
tools/yaml-validate.py
View File

@ -56,6 +56,7 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
'TenantNetCidr': ['default'],
'TenantAllocationPools': ['default'],
'InternalApiNetCidr': ['default'],
'UpdateIdentifier': ['description'],
# TODO(bnemec): Address these existing
# inconsistencies.
'NeutronMetadataProxySharedSecret': [
@ -98,8 +99,6 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
'OVNSouthboundServerPort': ['description'],
'ExternalInterfaceDefaultRoute':
['description', 'default'],
'DeployIdentifier': ['description',
'default'],
'ExternalIpUri': ['description'],
'IPPool': ['description'],
'ControlPlaneNetwork': ['description'],
@ -110,8 +109,6 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
'InternalApiAllocationPools': ['default'],
'NodeIndex': ['description'],
'SwiftPassword': ['description'],
'UpdateIdentifier': ['description',
'default'],
'name': ['description', 'default'],
'StorageNetName': ['description'],
'ManagementNetName': ['description'],