Make Deploy/UpdateIdentifier definition semi-consistent

It seems UpdateIdentifier is an overloaded parameter - it is used
both to trigger package updates in the minor update case as well as
to trigger the upgrade steps during a major upgrade.  I'm not sure
it's appropriate to change either of the descriptions as a result,
so for the moment that is added to the exclusion list.

Change-Id: Ied36cf259f6a6e5c8cfa7a01722fb7fda6900976
Partial-Bug: 1700664
This commit is contained in:
Ben Nemec 2017-06-27 10:26:08 -05:00 committed by Emilien Macchi
parent 8fb3da3c60
commit c02a343623
4 changed files with 6 additions and 4 deletions

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:

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

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.

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'],