diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-03-08 15:34:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-03-08 15:34:50 +0000 |
| commit | 31c91bed886f76e107a78021977e4c9bd338c76a (patch) | |
| tree | 8bc88614c932deab155b834e6187c733f2994304 /puppet/manifests/overcloud_controller_pacemaker.pp | |
| parent | 42fef7257ddceaca42086d8f6b75a19e61cbf68d (diff) | |
| parent | dbe67005a59f90a1ffe8e2d8b550ec5d6ca27a7e (diff) | |
Merge "Permits configuration of Cinder enabled_backend via hieradata"
Diffstat (limited to 'puppet/manifests/overcloud_controller_pacemaker.pp')
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 4ee2fc9e..2bb081aa 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -950,7 +950,7 @@ if hiera('step') >= 3 { $cinder_enabled_backends = delete_undef_values([$cinder_iscsi_backend, $cinder_rbd_backend, $cinder_eqlx_backend, $cinder_dellsc_backend, $cinder_netapp_backend, $cinder_nfs_backend]) class { '::cinder::backends' : - enabled_backends => $cinder_enabled_backends, + enabled_backends => union($cinder_enabled_backends, hiera('cinder_user_enabled_backends')), } class { '::sahara': |