diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-22 07:55:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-22 07:55:10 +0000 |
| commit | bb963cfe422d1ad4de2fa5b7cf24fa3907582ad9 (patch) | |
| tree | 7c509c4e479837f533f79626ce109eb9929877db | |
| parent | 617e5f1022da5309328a1d9c96399c1fedd257ec (diff) | |
| parent | c02a3436239df79ddecddde171b286f92aea2c10 (diff) | |
Merge "Make Deploy/UpdateIdentifier definition semi-consistent"
| -rw-r--r-- | extraconfig/post_deploy/example_run_on_update.yaml | 3 | ||||
| -rw-r--r-- | puppet/all-nodes-config.yaml | 1 | ||||
| -rw-r--r-- | puppet/major_upgrade_steps.j2.yaml | 1 | ||||
| -rwxr-xr-x | tools/yaml-validate.py | 5 |
4 files changed, 6 insertions, 4 deletions
diff --git a/extraconfig/post_deploy/example_run_on_update.yaml b/extraconfig/post_deploy/example_run_on_update.yaml index 346a1d77..4e378b14 100644 --- a/extraconfig/post_deploy/example_run_on_update.yaml +++ b/extraconfig/post_deploy/example_run_on_update.yaml @@ -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: diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml index b29a8a98..24aa1525 100644 --- a/puppet/all-nodes-config.yaml +++ b/puppet/all-nodes-config.yaml @@ -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 diff --git a/puppet/major_upgrade_steps.j2.yaml b/puppet/major_upgrade_steps.j2.yaml index 574c41b0..625ff4d9 100644 --- a/puppet/major_upgrade_steps.j2.yaml +++ b/puppet/major_upgrade_steps.j2.yaml @@ -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. diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py index d6d5194f..438f196e 100755 --- a/tools/yaml-validate.py +++ b/tools/yaml-validate.py @@ -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'], |