diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-04-21 06:50:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-04-21 06:50:03 +0000 |
| commit | b096c3225eec3f87ca795a377af917b0dead9ba3 (patch) | |
| tree | e863a79ce7093785c34c87d256dea37d229f6950 /puppet | |
| parent | 883d1dcb05e020526cfad9c22fa2a9d771332e38 (diff) | |
| parent | b11ed4ad643644779c63a23b7f7042ebd4de22e7 (diff) | |
Merge "Refresh description for swift/cinder/ceph storage nodes"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/ceph-storage-post-puppet.yaml | 2 | ||||
| -rw-r--r-- | puppet/ceph-storage-puppet.yaml | 2 | ||||
| -rw-r--r-- | puppet/cinder-storage-post.yaml | 4 | ||||
| -rw-r--r-- | puppet/cinder-storage-puppet.yaml | 2 | ||||
| -rw-r--r-- | puppet/swift-storage-post.yaml | 4 | ||||
| -rw-r--r-- | puppet/swift-storage-puppet.yaml | 2 |
6 files changed, 6 insertions, 10 deletions
diff --git a/puppet/ceph-storage-post-puppet.yaml b/puppet/ceph-storage-post-puppet.yaml index 5e1c42fa..53ecbe1f 100644 --- a/puppet/ceph-storage-post-puppet.yaml +++ b/puppet/ceph-storage-post-puppet.yaml @@ -1,7 +1,7 @@ heat_template_version: 2014-10-16 description: > - OpenStack Ceph Storage node post deployment for Puppet. + OpenStack ceph storage node post deployment for Puppet parameters: servers: diff --git a/puppet/ceph-storage-puppet.yaml b/puppet/ceph-storage-puppet.yaml index 1599a323..e9f82c2e 100644 --- a/puppet/ceph-storage-puppet.yaml +++ b/puppet/ceph-storage-puppet.yaml @@ -1,5 +1,5 @@ heat_template_version: 2014-10-16 -description: 'Common Ceph Storage Configuration for Puppet' +description: 'OpenStack ceph storage node configured by Puppet' parameters: Flavor: description: Flavor for the Ceph Storage node. diff --git a/puppet/cinder-storage-post.yaml b/puppet/cinder-storage-post.yaml index 28e87800..e11493c4 100644 --- a/puppet/cinder-storage-post.yaml +++ b/puppet/cinder-storage-post.yaml @@ -1,7 +1,5 @@ heat_template_version: 2014-10-16 -description: 'Common Block Storage Post Deployment' -# NOTE: this is a noop for os-apply-config style deployments because -# post deployment ordering is controlled by tripleo-image-elements +description: 'OpenStack cinder storage post deployment for Puppet' parameters: servers: diff --git a/puppet/cinder-storage-puppet.yaml b/puppet/cinder-storage-puppet.yaml index c7fd2ca0..ecea763b 100644 --- a/puppet/cinder-storage-puppet.yaml +++ b/puppet/cinder-storage-puppet.yaml @@ -1,5 +1,5 @@ heat_template_version: 2014-10-16 -description: 'Block Storage Configuration w/ Puppet' +description: 'OpenStack cinder storage configured by Puppet' parameters: Image: default: overcloud-cinder-volume diff --git a/puppet/swift-storage-post.yaml b/puppet/swift-storage-post.yaml index 3f069319..edceba97 100644 --- a/puppet/swift-storage-post.yaml +++ b/puppet/swift-storage-post.yaml @@ -1,7 +1,5 @@ heat_template_version: 2014-10-16 -description: 'Swift Storage Post Deployment' -# NOTE: this is a noop for os-apply-config style deployments because -# post deployment ordering is controlled by tripleo-image-elements +description: 'OpenStack swift storage node post deployment for Puppet' parameters: servers: diff --git a/puppet/swift-storage-puppet.yaml b/puppet/swift-storage-puppet.yaml index 6d446b00..eba44e6c 100644 --- a/puppet/swift-storage-puppet.yaml +++ b/puppet/swift-storage-puppet.yaml @@ -1,5 +1,5 @@ heat_template_version: 2014-10-16 -description: 'Common Swift Storage Configuration' +description: 'OpenStack swift storage node configured by Puppet' parameters: Flavor: description: Flavor for Swift storage nodes to request when deploying. |