openstack
/
puppet-manila
Code Issues Proposed changes

Merge "Unity: Add support for report_default_filter_function"

This commit is contained in:
Zuul 2022-01-07 23:14:04 +00:00 committed by Gerrit Code Review
parent a09e1f2b99 5976686b74
commit d673ca4ad0
3 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
manifests/backend/dellemc_unity.pp
View File

@ -58,6 +58,10 @@
# mode. It is required when driver_handles_share_servers=False in manila.conf.
# Defaults to $::os_service_default
#
# [*report_default_filter_function*]
# (optional) Whether or not report default filter function.
# Defaults to $::os_service_default
#
# [*network_plugin_ipv6_enabled*]
# (optional) Whether to support IPv6 network resource, Default=False.
# If this option is True, both IPv4 and IPv6 are supported.
@ -93,17 +97,18 @@ define manila::backend::dellemc_unity (
$emc_nas_login,
$emc_nas_password,
$emc_nas_server,
$emc_share_backend = 'unity',
$share_backend_name = $name,
$backend_availability_zone = $::os_service_default,
$unity_server_meta_pool = undef,
$unity_share_data_pools = undef,
$unity_ethernet_ports = undef,
$unity_share_server = $::os_service_default,
$network_plugin_ipv6_enabled = true,
$emc_ssl_cert_verify = false,
$emc_ssl_cert_path = undef,
$package_ensure = 'present',
$emc_share_backend = 'unity',
$share_backend_name = $name,
$backend_availability_zone = $::os_service_default,
$unity_server_meta_pool = undef,
$unity_share_data_pools = undef,
$unity_ethernet_ports = undef,
$unity_share_server = $::os_service_default,
$report_default_filter_function = $::os_service_default,
$network_plugin_ipv6_enabled = true,
$emc_ssl_cert_verify = false,
$emc_ssl_cert_path = undef,
$package_ensure = 'present',
) {
include manila::deps
@ -114,21 +119,22 @@ define manila::backend::dellemc_unity (
$unity_share_driver = 'manila.share.drivers.dell_emc.driver.EMCShareDriver'
manila_config {
"${share_backend_name}/share_driver": value => $unity_share_driver;
"${share_backend_name}/driver_handles_share_servers": value => $driver_handles_share_servers;
"${share_backend_name}/emc_nas_login": value => $emc_nas_login;
"${share_backend_name}/emc_nas_password": value => $emc_nas_password, secret => true;
"${share_backend_name}/emc_nas_server": value => $emc_nas_server;
"${share_backend_name}/share_backend_name": value => $share_backend_name;
"${share_backend_name}/backend_availability_zone": value => $backend_availability_zone;
"${share_backend_name}/emc_share_backend": value => $emc_share_backend;
"${share_backend_name}/unity_server_meta_pool": value => $unity_server_meta_pool;
"${share_backend_name}/unity_share_data_pools": value => join(any2array($unity_share_data_pools), ',');
"${share_backend_name}/unity_ethernet_ports": value => join(any2array($unity_ethernet_ports), ',');
"${share_backend_name}/unity_share_server": value => $unity_share_server;
"${share_backend_name}/network_plugin_ipv6_enabled": value => $network_plugin_ipv6_enabled;
"${share_backend_name}/emc_ssl_cert_verify": value => $emc_ssl_cert_verify;
"${share_backend_name}/emc_ssl_cert_path": value => $emc_ssl_cert_path;
"${share_backend_name}/share_driver": value => $unity_share_driver;
"${share_backend_name}/driver_handles_share_servers": value => $driver_handles_share_servers;
"${share_backend_name}/emc_nas_login": value => $emc_nas_login;
"${share_backend_name}/emc_nas_password": value => $emc_nas_password, secret => true;
"${share_backend_name}/emc_nas_server": value => $emc_nas_server;
"${share_backend_name}/share_backend_name": value => $share_backend_name;
"${share_backend_name}/backend_availability_zone": value => $backend_availability_zone;
"${share_backend_name}/emc_share_backend": value => $emc_share_backend;
"${share_backend_name}/unity_server_meta_pool": value => $unity_server_meta_pool;
"${share_backend_name}/unity_share_data_pools": value => join(any2array($unity_share_data_pools), ',');
"${share_backend_name}/unity_ethernet_ports": value => join(any2array($unity_ethernet_ports), ',');
"${share_backend_name}/unity_share_server": value => $unity_share_server;
"${share_backend_name}/report_default_filter_function": value => $report_default_filter_function;
"${share_backend_name}/network_plugin_ipv6_enabled": value => $network_plugin_ipv6_enabled;
"${share_backend_name}/emc_ssl_cert_verify": value => $emc_ssl_cert_verify;
"${share_backend_name}/emc_ssl_cert_path": value => $emc_ssl_cert_path;
}
ensure_packages('nfs-client', {

5
releasenotes/notes/unity-report_default_filter_function-5d42810bbbeabca7.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
The ``manila::backend::dellemc_unity`` resource type now supports
the ``report_default_filter_function`` parameter.

2
spec/defines/manila_backend_dellemc_unity_spec.rb
View File

@ -14,6 +14,7 @@ describe 'manila::backend::dellemc_unity' do
:unity_share_data_pools => '*',
:unity_ethernet_ports => 'eth1',
:unity_share_server => '192.168.0.1',
:report_default_filter_function => false,
:network_plugin_ipv6_enabled => true,
:emc_ssl_cert_verify => true,
:emc_ssl_cert_path => '/etc/ssl/certs/',
@ -28,6 +29,7 @@ describe 'manila::backend::dellemc_unity' do
:unity_share_data_pools => '<SERVICE DEFAULT>',
:unity_ethernet_ports => '<SERVICE DEFAULT>',
:unity_share_server => '<SERVICE DEFAULT>',
:report_default_filter_function => '<SERVICE DEFAULT>',
:network_plugin_ipv6_enabled => '<SERVICE DEFAULT>',
:emc_ssl_cert_verify => '<SERVICE DEFAULT>',
:emc_ssl_cert_path => '<SERVICE DEFAULT>',