aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/swift-storage-post.yaml
diff options
context:
space:
mode:
authorSteven Hardy <shardy@redhat.com>2016-05-12 14:58:39 +0100
committerSteven Hardy <shardy@redhat.com>2016-07-04 21:24:16 +0100
commit59b6afcd35f9fc136f75b22c0b51bbe8f7005a6a (patch)
tree02dce17867fffe84fbc15ab08cbc703238ec0521 /puppet/swift-storage-post.yaml
parent794fece5cc25d74ca0d874174e2c837a15750fbf (diff)
Replace NodeConfigIdentifiers with DeployIdentifier
We added NodeConfigIdentifiers to trigger config to be re-applied on update, but then later added DeployIdentifier which forces config to *always* be applied on update, so we can simplify things by just referencing the DeployIdentifier directly. Change-Id: I79212def1936740825b714419dcb4952bc586a39
Diffstat (limited to 'puppet/swift-storage-post.yaml')
-rw-r--r--puppet/swift-storage-post.yaml14
1 files changed, 7 insertions, 7 deletions
diff --git a/puppet/swift-storage-post.yaml b/puppet/swift-storage-post.yaml
index b873d92..1c36a04 100644
--- a/puppet/swift-storage-post.yaml
+++ b/puppet/swift-storage-post.yaml
@@ -8,12 +8,12 @@ parameters:
type: boolean
servers:
type: json
- NodeConfigIdentifiers:
- type: json
- description: Value which changes if the node configuration may need to be re-applied
RoleData:
type: json
default: {}
+ DeployIdentifier:
+ type: string
+ description: Value which changes if the node configuration may need to be re-applied
resources:
@@ -26,7 +26,7 @@ resources:
servers: {get_param: servers}
config: {get_resource: StorageArtifactsConfig}
input_values:
- update_identifier: {get_param: NodeConfigIdentifiers}
+ update_identifier: {get_param: DeployIdentifier}
StoragePuppetConfig:
type: OS::Heat::SoftwareConfig
@@ -56,7 +56,7 @@ resources:
config: {get_resource: StoragePuppetConfig}
input_values:
step: 2
- update_identifier: {get_param: NodeConfigIdentifiers}
+ update_identifier: {get_param: DeployIdentifier}
StorageRingbuilderDeployment_Step3:
type: OS::Heat::StructuredDeployments
@@ -67,7 +67,7 @@ resources:
config: {get_resource: StoragePuppetConfig}
input_values:
step: 3
- update_identifier: {get_param: NodeConfigIdentifiers}
+ update_identifier: {get_param: DeployIdentifier}
StorageDeployment_Step4:
type: OS::Heat::StructuredDeployments
@@ -78,7 +78,7 @@ resources:
config: {get_resource: StoragePuppetConfig}
input_values:
step: 4
- update_identifier: {get_param: NodeConfigIdentifiers}
+ update_identifier: {get_param: DeployIdentifier}
# Note, this should come last, so use depends_on to ensure
# this is created after any other resources.