Merge "Update DellEMC Manila Unity driver" into stable/queens
This commit is contained in:
commit
187b1e7271
|
@ -46,6 +46,23 @@
|
|||
# port and link aggregation port can be used by Unity share driver.
|
||||
# Defaults to None
|
||||
#
|
||||
# [*network_plugin_ipv6_enabled*]
|
||||
# (optional) Whether to support IPv6 network resource, Default=False.
|
||||
# If this option is True, both IPv4 and IPv6 are supported.
|
||||
# If this option is False, only IPv4 is supported.
|
||||
# Defaults to true
|
||||
#
|
||||
# [*emc_ssl_cert_verify*]
|
||||
# (optional) If set to False the https client will not validate the
|
||||
# SSL certificate of the backend endpoint.
|
||||
# Defaults to false
|
||||
#
|
||||
# [*emc_ssl_cert_path*]
|
||||
# (optional) Can be used to specify a non default path to a
|
||||
# CA_BUNDLE file or directory with certificates of trusted
|
||||
# CAs, which will be used to validate the backend.
|
||||
# Defaults to None
|
||||
#
|
||||
# [*package_ensure*]
|
||||
# (optional) Ensure state for package. Defaults to 'present'.
|
||||
#
|
||||
|
@ -65,11 +82,14 @@ define manila::backend::dellemc_unity (
|
|||
$emc_nas_password,
|
||||
$emc_nas_server,
|
||||
$emc_share_backend,
|
||||
$share_backend_name = $name,
|
||||
$unity_server_meta_pool = undef,
|
||||
$unity_share_data_pools = undef ,
|
||||
$unity_ethernet_ports = undef,
|
||||
$package_ensure = 'present',
|
||||
$share_backend_name = $name,
|
||||
$unity_server_meta_pool = undef,
|
||||
$unity_share_data_pools = undef,
|
||||
$unity_ethernet_ports = undef,
|
||||
$network_plugin_ipv6_enabled = true,
|
||||
$emc_ssl_cert_verify = false,
|
||||
$emc_ssl_cert_path = undef,
|
||||
$package_ensure = 'present',
|
||||
) {
|
||||
|
||||
include ::manila::deps
|
||||
|
@ -89,6 +109,9 @@ define manila::backend::dellemc_unity (
|
|||
"${share_backend_name}/unity_server_meta_pool": value => $unity_server_meta_pool;
|
||||
"${share_backend_name}/unity_share_data_pools": value => $unity_share_data_pools;
|
||||
"${share_backend_name}/unity_ethernet_ports": value => $unity_ethernet_ports;
|
||||
"${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_resource('package','nfs-utils',{
|
||||
|
@ -96,7 +119,7 @@ define manila::backend::dellemc_unity (
|
|||
tag => 'manila-support-package',
|
||||
})
|
||||
|
||||
#Python library storops is required to run Unity driver.
|
||||
# Python library storops is required to run Unity driver.
|
||||
package{'storops':
|
||||
ensure => $package_ensure,
|
||||
provider => 'pip',
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
---
|
||||
features:
|
||||
- |
|
||||
This patch adds following 3 options for DellEMC Unity driver:
|
||||
* network_plugin_ipv6_enabled: this option is set to True by default
|
||||
* emc_ssl_cert_verify: this option is set to False by default
|
||||
* emc_ssl_cert_path
|
|
@ -14,6 +14,9 @@ describe 'manila::backend::dellemc_unity' do
|
|||
:unity_server_meta_pool => 'pool1',
|
||||
:unity_share_data_pools => '*',
|
||||
:unity_ethernet_ports => 'eth1',
|
||||
:network_plugin_ipv6_enabled => true,
|
||||
:emc_ssl_cert_verify => true,
|
||||
:emc_ssl_cert_path => '/etc/ssl/certs/',
|
||||
}
|
||||
end
|
||||
|
||||
|
@ -22,6 +25,9 @@ describe 'manila::backend::dellemc_unity' do
|
|||
:unity_server_meta_pool => '<SERVICE DEFAULT>',
|
||||
:unity_share_data_pools => '<SERVICE DEFAULT>',
|
||||
:unity_ethernet_ports => '<SERVICE DEFAULT>',
|
||||
:network_plugin_ipv6_enabled => '<SERVICE DEFAULT>',
|
||||
:emc_ssl_cert_verify => '<SERVICE DEFAULT>',
|
||||
:emc_ssl_cert_path => '<SERVICE DEFAULT>',
|
||||
}
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue