diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-07-05 09:55:59 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-07-05 09:55:59 +0000 |
commit | 519b94ff1e2b4d3de563ca28c14cb48a4fbcf34c (patch) | |
tree | f727d0defc49377fd1f2f10f39075dea63977558 /puppet/ceph-storage-post.yaml | |
parent | 9f8e1685513f6671369295e97ec254e855c606cd (diff) | |
parent | 59b6afcd35f9fc136f75b22c0b51bbe8f7005a6a (diff) |
Merge "Replace NodeConfigIdentifiers with DeployIdentifier"
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. |