diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-12-09 09:51:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-12-09 09:51:04 +0000 |
| commit | 9fcf8ac9ffc54e9377dd7aaa137401da2c717c89 (patch) | |
| tree | 313e46ddb5577ddb7cb8ddd1fee8af8c807f6719 /manifests | |
| parent | b50938c8cefce85482b0ce282efdaf7c718084ba (diff) | |
| parent | f418c79632a7f21ff6ab11ef1715cd4a5b361789 (diff) | |
Merge "Add cinder profile spec tests"
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/profile/base/cinder/volume.pp | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/manifests/profile/base/cinder/volume.pp b/manifests/profile/base/cinder/volume.pp index 7d562ec..64927b6 100644 --- a/manifests/profile/base/cinder/volume.pp +++ b/manifests/profile/base/cinder/volume.pp @@ -108,13 +108,19 @@ class tripleo::profile::base::cinder::volume ( $cinder_rbd_backend_name = undef } - $cinder_enabled_backends = delete_undef_values([$cinder_iscsi_backend_name, - $cinder_rbd_backend_name, - $cinder_eqlx_backend_name, - $cinder_dellsc_backend_name, - $cinder_netapp_backend_name, - $cinder_nfs_backend_name, - $cinder_user_enabled_backends]) + $backends = delete_undef_values([$cinder_iscsi_backend_name, + $cinder_rbd_backend_name, + $cinder_eqlx_backend_name, + $cinder_dellsc_backend_name, + $cinder_netapp_backend_name, + $cinder_nfs_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 + # delete_undef_values function. So we need to make sure we don't have any + # "" strings in our array. + $cinder_enabled_backends = delete($backends, '') + class { '::cinder::backends' : enabled_backends => $cinder_enabled_backends, } |