aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base/cinder/volume.pp
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-10 21:56:56 +0000
committerGerrit Code Review <review@openstack.org>2017-02-10 21:56:56 +0000
commite4e9f85c648d33079f1fdc33d8a097977ab1b3c6 (patch)
tree0456baa82caa2e139d05b20c82c4323f9cb8557f /manifests/profile/base/cinder/volume.pp
parent41b5619ab4867a042af02e3b09f2d1a8161a716d (diff)
parentf1065f3f65c77db64bd0c2caa11187326c45db25 (diff)
Merge "Add module to support ScaleIO backend in Cinder"
Diffstat (limited to 'manifests/profile/base/cinder/volume.pp')
-rw-r--r--manifests/profile/base/cinder/volume.pp13
1 files changed, 13 insertions, 0 deletions
diff --git a/manifests/profile/base/cinder/volume.pp b/manifests/profile/base/cinder/volume.pp
index 79238c0..9fb1594 100644
--- a/manifests/profile/base/cinder/volume.pp
+++ b/manifests/profile/base/cinder/volume.pp
@@ -46,6 +46,10 @@
# (Optional) Whether to enable the rbd backend
# Defaults to true
#
+# [*cinder_enable_scaleio_backend*]
+# (Optional) Whether to enable the scaleio backend
+# Defaults to true
+#
# [*cinder_user_enabled_backends*]
# (Optional) List of additional backend stanzas to activate
# Defaults to hiera('cinder_user_enabled_backends')
@@ -63,6 +67,7 @@ class tripleo::profile::base::cinder::volume (
$cinder_enable_netapp_backend = false,
$cinder_enable_nfs_backend = false,
$cinder_enable_rbd_backend = false,
+ $cinder_enable_scaleio_backend = false,
$cinder_user_enabled_backends = hiera('cinder_user_enabled_backends', undef),
$step = hiera('step'),
) {
@@ -120,6 +125,13 @@ class tripleo::profile::base::cinder::volume (
$cinder_rbd_backend_name = undef
}
+ if $cinder_enable_scaleio_backend {
+ include ::tripleo::profile::base::cinder::volume::scaleio
+ $cinder_scaleio_backend_name = hiera('cinder::backend::scaleio::volume_backend_name', 'tripleo_scaleio')
+ } else {
+ $cinder_scaleio_backend_name = undef
+ }
+
$backends = delete_undef_values([$cinder_iscsi_backend_name,
$cinder_rbd_backend_name,
$cinder_dellps_backend_name,
@@ -127,6 +139,7 @@ class tripleo::profile::base::cinder::volume (
$cinder_hpelefthand_backend_name,
$cinder_netapp_backend_name,
$cinder_nfs_backend_name,
+ $cinder_scaleio_backend_name,
$cinder_user_enabled_backends])
# NOTE(aschultz): during testing it was found that puppet 3 may incorrectly
# include a "" in the previous array which is not removed by the