Allow enabling custom backends with manila
It is possible to provide the config settings to add an arbitrary and unmanaged backend to Manila at deployment time via Heat environment files. However, puppet-tripleo doesn't support extending the list of enabled backends. Add this capability. Change-Id: I82f62df0a95f03afbda1b6a4ddaa67ef908030a9 Closes-Bug: #1831938 (cherry picked from commit914cf1f124
) (cherry picked from commitecbec17a33
)
This commit is contained in:
parent
819c576c71
commit
fdab9a1699
|
@ -46,6 +46,10 @@
|
|||
# (Optional) Whether or not the vnx backend is enabled
|
||||
# Defaults to hiera('manila_backend_vnx_enabled', false)
|
||||
#
|
||||
# [*manila_user_enabled_backends*]
|
||||
# (Optional) List of additional backend stanzas to activate
|
||||
# Defaults to hiera('manila_user_enabled_backends', undef)
|
||||
#
|
||||
# [*step*]
|
||||
# (Optional) The current step in deployment. See tripleo-heat-templates
|
||||
# for more details.
|
||||
|
@ -59,6 +63,7 @@ class tripleo::profile::base::manila::share (
|
|||
$backend_unity_enabled = hiera('manila_backend_unity_enabled', false),
|
||||
$backend_vnx_enabled = hiera('manila_backend_vnx_enabled', false),
|
||||
$backend_cephfs_enabled = hiera('manila_backend_cephfs_enabled', false),
|
||||
$manila_user_enabled_backends = hiera('manila_user_enabled_backends', undef),
|
||||
$step = Integer(hiera('step')),
|
||||
) {
|
||||
include ::tripleo::profile::base::manila
|
||||
|
@ -241,17 +246,16 @@ class tripleo::profile::base::manila::share (
|
|||
}
|
||||
}
|
||||
|
||||
$manila_enabled_backends = delete_undef_values(
|
||||
[
|
||||
$manila_generic_backend,
|
||||
$backends = delete_undef_values(concat([], $manila_generic_backend,
|
||||
$manila_cephfs_backend,
|
||||
$manila_netapp_backend,
|
||||
$manila_vmax_backend,
|
||||
$manila_isilon_backend,
|
||||
$manila_unity_backend,
|
||||
$manila_vnx_backend
|
||||
]
|
||||
)
|
||||
$manila_vnx_backend,
|
||||
$manila_user_enabled_backends))
|
||||
$manila_enabled_backends = delete($backends, '')
|
||||
|
||||
class { '::manila::backends' :
|
||||
enabled_share_backends => $manila_enabled_backends,
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue