openstack
/
puppet-tripleo
Code Issues Proposed changes

Add Pure Storage FlashBlade Manila backend 

Depends-On: I08c52c42916909e6689564d20bc778dfaf0f23ff
Change-Id: If204a13609ace655e03808a7eb5db0fcf1202360
This commit is contained in:
Simon Dodsley 2021-05-20 16:13:29 -04:00 committed by Takashi Kajinami
parent a2d8079eac
commit c039e2125a
3 changed files with 48 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
manifests/profile/base/manila/api.pp
View File

@ -46,6 +46,10 @@
# (Optional) Whether or not the vnx backend is enabled
# Defaults to hiera('manila_backend_vnx_enabled', false)
#
# [*backend_flashblade_enabled*]
# (Optional) Whether or not the flashblade backend is enabled
# Defaults to hiera('manila_backend_flashblade_enabled', false)
#
# [*backend_cephfs_enabled*]
# (Optional) Whether or not the cephfs backend is enabled
# Defaults to hiera('manila_backend_cephfs_enabled', false)
@ -85,20 +89,21 @@
# Defaults to true
#
class tripleo::profile::base::manila::api (
$enabled_share_protocols = hiera('manila_enabled_share_protocols', undef),
$backend_generic_enabled = hiera('manila_backend_generic_enabled', false),
$backend_netapp_enabled = hiera('manila_backend_netapp_enabled', false),
$backend_vmax_enabled = hiera('manila_backend_vmax_enabled', false),
$backend_isilon_enabled = hiera('manila_backend_isilon_enabled', false),
$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),
$bootstrap_node = hiera('manila_api_short_bootstrap_node_name', undef),
$certificates_specs = hiera('apache_certificates_specs', {}),
$manila_api_network = hiera('manila_api_network', undef),
$enable_internal_tls = hiera('enable_internal_tls', false),
$step = Integer(hiera('step')),
$manila_enable_db_purge = true,
$enabled_share_protocols = hiera('manila_enabled_share_protocols', undef),
$backend_generic_enabled = hiera('manila_backend_generic_enabled', false),
$backend_netapp_enabled = hiera('manila_backend_netapp_enabled', false),
$backend_vmax_enabled = hiera('manila_backend_vmax_enabled', false),
$backend_isilon_enabled = hiera('manila_backend_isilon_enabled', false),
$backend_unity_enabled = hiera('manila_backend_unity_enabled', false),
$backend_vnx_enabled = hiera('manila_backend_vnx_enabled', false),
$backend_flashblade_enabled = hiera('manila_backend_flashblade_enabled', false),
$backend_cephfs_enabled = hiera('manila_backend_cephfs_enabled', false),
$bootstrap_node = hiera('manila_api_short_bootstrap_node_name', undef),
$certificates_specs = hiera('apache_certificates_specs', {}),
$manila_api_network = hiera('manila_api_network', undef),
$enable_internal_tls = hiera('enable_internal_tls', false),
$step = Integer(hiera('step')),
$manila_enable_db_purge = true,
) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
@ -128,7 +133,8 @@ class tripleo::profile::base::manila::api (
} else {
if $backend_generic_enabled or $backend_netapp_enabled
or $backend_vmax_enabled or $backend_isilon_enabled
or $backend_unity_enabled or $backend_vnx_enabled {
or $backend_unity_enabled or $backend_vnx_enabled
or $backend_flashblade_enabled{
$nfs_protocol = 'NFS'
$cifs_protocol = 'CIFS'
} else {

29
manifests/profile/base/manila/share.pp
View File

@ -38,14 +38,18 @@
# (Optional) Whether or not the unity backend is enabled
# Defaults to hiera('manila_backend_unity_enabled', false)
#
# [*backend_cephfs_enabled*]
# (Optional) Whether or not the cephfs backend is enabled
# Defaults to hiera('manila_backend_cephfs_enabled', false)
#
# [*backend_vnx_enabled*]
# (Optional) Whether or not the vnx backend is enabled
# Defaults to hiera('manila_backend_vnx_enabled', false)
#
# [*backend_flashblade_enabled*]
# (Optional) Whether or not the flashblade backend is enabled
# Defaults to hiera('manila_backend_flashblade_enabled', false)
#
# [*backend_cephfs_enabled*]
# (Optional) Whether or not the cephfs backend is enabled
# Defaults to hiera('manila_backend_cephfs_enabled', false)
#
# [*manila_user_enabled_backends*]
# (Optional) List of additional backend stanzas to activate
# Defaults to hiera('manila_user_enabled_backends', undef)
@ -62,6 +66,7 @@ class tripleo::profile::base::manila::share (
$backend_isilon_enabled = hiera('manila_backend_isilon_enabled', false),
$backend_unity_enabled = hiera('manila_backend_unity_enabled', false),
$backend_vnx_enabled = hiera('manila_backend_vnx_enabled', false),
$backend_flashblade_enabled = hiera('manila_backend_flashblade_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')),
@ -189,6 +194,7 @@ class tripleo::profile::base::manila::share (
'vmax_ethernet_ports' => hiera('manila::backend::dellemc_vmax::vmax_ethernet_ports', undef),
})})
}
# manila unity:
if $backend_unity_enabled {
$manila_unity_backend = hiera('manila::backend::dellemc_unity::title')
@ -206,6 +212,7 @@ class tripleo::profile::base::manila::share (
'emc_ssl_cert_path' => hiera('manila::backend::dellemc_unity::emc_ssl_cert_path', undef),
})})
}
# manila vnx:
if $backend_vnx_enabled {
$manila_vnx_backend = hiera('manila::backend::dellemc_vnx::title')
@ -224,8 +231,6 @@ class tripleo::profile::base::manila::share (
})})
}
# manila isilon:
if $backend_isilon_enabled {
$manila_isilon_backend = hiera('manila::backend::dellemc_isilon::title')
@ -241,6 +246,17 @@ class tripleo::profile::base::manila::share (
})})
}
# manila flashblade:
if $backend_flashblade_enabled {
$manila_flashblade_backend = hiera('manila::backend::flashblade::title')
create_resources('manila::backend::flashblade', { $manila_flashblade_backend => delete_undef_values({
'flashblade_mgmt_vip' => hiera('manila::backend::flashblade::flashblade_mgmt_vip', undef),
'flashblade_data_vip' => hiera('manila::backend::flashblade::flashblade_data_vip', undef),
'flashblade_api_token' => hiera('manila::backend::flashblade::flashblade_api_token', undef),
'flashblade_eradicate' => hiera('manila::backend::flashblade::flashblade_eradicate', undef),
})})
}
$backends = delete_undef_values(concat([], $manila_generic_backend,
$manila_cephfs_backend,
$manila_netapp_backend,
@ -248,6 +264,7 @@ class tripleo::profile::base::manila::share (
$manila_isilon_backend,
$manila_unity_backend,
$manila_vnx_backend,
$manila_flashblade_backend,
$manila_user_enabled_backends))
$manila_enabled_backends = delete($backends, '')

4
releasenotes/notes/flashblade_driver-bd6df03b7f140071.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- |
Add support to configure Pure Storage FlashBlade Manila backend.