diff options
| author |   Carlos Camacho <ccamacho@redhat.com> | 2016-08-05 11:54:25 +0200 |
|---|---|---|
| committer | Carlos Camacho <ccamacho@redhat.com> | 2016-08-08 22:44:01 +0200 |
| commit | 689d80e97188342c84bb965980d48c8ed212e60d (patch) | |
| tree | c155a18c188595d17007ee0f67b9b6ecd7c7af04 /manifests/profile/base/cinder/volume/rbd.pp | |
| parent | ac6c502a69bef7f00633499e2d21b3ec756c21ae (diff) | |
Fix parameters and headers inconsistency in the puppet manifests.
As we are staring to manually check overcloud services
the first step is to check that the puppet profiles
are all aligned.
Changes applied:
No logic added or removed in this submission.
Removed unused parameters.
Align header comments structure.
All profiles parameters sorted following:
"Mandatory params first sorted alphabetically
then optional params sorted alphabetically."
Note: Following submissions will check pacemaker,
cinder, mistral and redis services in the base profiles
as some of them has the $pacemaker_master parameter
defaulted to true.
Change-Id: I2f91c3f6baa33f74b5625789eec83233179a9655
Diffstat (limited to 'manifests/profile/base/cinder/volume/rbd.pp')
| -rw-r--r-- | manifests/profile/base/cinder/volume/rbd.pp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/manifests/profile/base/cinder/volume/rbd.pp b/manifests/profile/base/cinder/volume/rbd.pp index 6c8341a..1246de8 100644 --- a/manifests/profile/base/cinder/volume/rbd.pp +++ b/manifests/profile/base/cinder/volume/rbd.pp @@ -18,6 +18,10 @@ # # === Parameters # +# [*backend_name*] +# (Optional) Name given to the Cinder backend stanza +# Defaults to 'tripleo_ceph' +# # [*cinder_rbd_backend_host*] # (Optional) String to use as backend_host in the backend stanza # Defaults to 'cinder::host' @@ -34,24 +38,19 @@ # (Optional) The user name for the RBD client # Defaults to 'openstack' # -# [*backend_name*] -# (Optional) Name given to the Cinder backend stanza -# Defaults to 'tripleo_ceph' -# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # class tripleo::profile::base::cinder::volume::rbd ( + $backend_name = hiera('cinder::backend::rbd::volume_backend_name', 'tripleo_ceph'), $cinder_rbd_backend_host = hiera('cinder::host', 'hostgroup'), $cinder_rbd_pool_name = 'volumes', $cinder_rbd_secret_uuid = hiera('ceph::profile::params::fsid', undef), $cinder_rbd_user_name = 'openstack', - $backend_name = hiera('cinder::backend::rbd::volume_backend_name', 'tripleo_ceph'), $step = hiera('step'), ) { - include ::tripleo::profile::base::cinder::volume if $step >= 4 { |