openstack/puppet-manila
Code Issues Proposed changes

Unity: Add support for unity_share_server

Browse Source 
Change-Id: I764a2e8e3cbdb6def071d6092d6652e9f173ad38
This commit is contained in:
Takashi Kajinami 2022-01-06 18:58:30 +09:00
parent dd4b7c860b
commit 3f089d4034
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/backend/dellemc_unity.pp
View File

@ -53,6 +53,11 @@
# port and link aggregation port can be used by Unity share driver. # port and link aggregation port can be used by Unity share driver.
# Defaults to None # Defaults to None
# #
# [*unity_share_server*]
# (optional) NAS server used for creating share when driver is in DHSS=False
# mode. It is required when driver_handles_share_servers=False in manila.conf.
# Defaults to $::os_service_default
#
# [*network_plugin_ipv6_enabled*] # [*network_plugin_ipv6_enabled*]
# (optional) Whether to support IPv6 network resource, Default=False. # (optional) Whether to support IPv6 network resource, Default=False.
# If this option is True, both IPv4 and IPv6 are supported. # If this option is True, both IPv4 and IPv6 are supported.
@ -94,6 +99,7 @@ define manila::backend::dellemc_unity (
$unity_server_meta_pool = undef, $unity_server_meta_pool = undef,
$unity_share_data_pools = undef, $unity_share_data_pools = undef,
$unity_ethernet_ports = undef, $unity_ethernet_ports = undef,
$unity_share_server = $::os_service_default,
$network_plugin_ipv6_enabled = true, $network_plugin_ipv6_enabled = true,
$emc_ssl_cert_verify = false, $emc_ssl_cert_verify = false,
$emc_ssl_cert_path = undef, $emc_ssl_cert_path = undef,
@ -119,6 +125,7 @@ define manila::backend::dellemc_unity (
"${share_backend_name}/unity_server_meta_pool": value => $unity_server_meta_pool; "${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_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_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}/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_verify": value => $emc_ssl_cert_verify;
"${share_backend_name}/emc_ssl_cert_path": value => $emc_ssl_cert_path; "${share_backend_name}/emc_ssl_cert_path": value => $emc_ssl_cert_path;

5
releasenotes/notes/unity_share_server-31bce3e772e0b617.yaml Normal file
View File

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

18
spec/defines/manila_backend_dellemc_unity_spec.rb
View File

@ -13,6 +13,7 @@ describe 'manila::backend::dellemc_unity' do
:unity_server_meta_pool => 'pool1', :unity_server_meta_pool => 'pool1',
:unity_share_data_pools => '*', :unity_share_data_pools => '*',
:unity_ethernet_ports => 'eth1', :unity_ethernet_ports => 'eth1',
:unity_share_server => '192.168.0.1',
:network_plugin_ipv6_enabled => true, :network_plugin_ipv6_enabled => true,
:emc_ssl_cert_verify => true, :emc_ssl_cert_verify => true,
:emc_ssl_cert_path => '/etc/ssl/certs/', :emc_ssl_cert_path => '/etc/ssl/certs/',
@ -22,14 +23,15 @@ describe 'manila::backend::dellemc_unity' do
let :default_params do let :default_params do
{ {
:emc_share_backend => 'unity', :emc_share_backend => 'unity',
:unity_server_meta_pool => '<SERVICE DEFAULT>', :unity_server_meta_pool => '<SERVICE DEFAULT>',
:unity_share_data_pools => '<SERVICE DEFAULT>', :unity_share_data_pools => '<SERVICE DEFAULT>',
:unity_ethernet_ports => '<SERVICE DEFAULT>', :unity_ethernet_ports => '<SERVICE DEFAULT>',
:network_plugin_ipv6_enabled => '<SERVICE DEFAULT>', :unity_share_server => '<SERVICE DEFAULT>',
:emc_ssl_cert_verify => '<SERVICE DEFAULT>', :network_plugin_ipv6_enabled => '<SERVICE DEFAULT>',
:emc_ssl_cert_path => '<SERVICE DEFAULT>', :emc_ssl_cert_verify => '<SERVICE DEFAULT>',
:backend_availability_zone => '<SERVICE DEFAULT>', :emc_ssl_cert_path => '<SERVICE DEFAULT>',
:backend_availability_zone => '<SERVICE DEFAULT>',
} }
end end