diff options
| author |   Steven Hardy <shardy@redhat.com> | 2016-05-12 14:58:39 +0100 |
|---|---|---|
| committer | Steven Hardy <shardy@redhat.com> | 2016-07-04 21:24:16 +0100 |
| commit | 59b6afcd35f9fc136f75b22c0b51bbe8f7005a6a (patch) | |
| tree | 02dce17867fffe84fbc15ab08cbc703238ec0521 /puppet/ceph-storage-post.yaml | |
| parent | 794fece5cc25d74ca0d874174e2c837a15750fbf (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/ceph-storage-post.yaml')
| -rw-r--r-- | puppet/ceph-storage-post.yaml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/puppet/ceph-storage-post.yaml b/puppet/ceph-storage-post.yaml index edeb2d93..70baeb6e 100644 --- a/puppet/ceph-storage-post.yaml +++ b/puppet/ceph-storage-post.yaml @@ -10,12 +10,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: @@ -28,7 +28,7 @@ resources: servers: {get_param: servers} config: {get_resource: CephStorageArtifactsConfig} input_values: - update_identifier: {get_param: NodeConfigIdentifiers} + update_identifier: {get_param: DeployIdentifier} CephStoragePuppetConfig: type: OS::Heat::SoftwareConfig @@ -57,7 +57,7 @@ resources: config: {get_resource: CephStoragePuppetConfig} input_values: step: 2 - update_identifier: {get_param: NodeConfigIdentifiers} + update_identifier: {get_param: DeployIdentifier} CephStorageDeployment_Step3: type: OS::Heat::StructuredDeployments @@ -68,7 +68,7 @@ resources: config: {get_resource: CephStoragePuppetConfig} input_values: step: 3 - 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. |