openstack
/
puppet-manila
Code Issues Proposed changes

Merge "Update default value of emc_ssl_cert_verify"

This commit is contained in:
Zuul 2023-05-23 02:42:50 +00:00 committed by Gerrit Code Review
parent 18a5b079d6 0c799e8f89
commit da47296e04
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/backend/dellemc_unity.pp
View File

@ -70,13 +70,13 @@
# [*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
# Defaults to $facts['os_service_default']
#
# [*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
# Defaults to $facts['os_service_default']
#
# [*package_ensure*]
# (optional) Ensure state for package. Defaults to 'present'.
@ -105,7 +105,7 @@ define manila::backend::dellemc_unity (
$unity_share_server = $facts['os_service_default'],
$report_default_filter_function = $facts['os_service_default'],
$network_plugin_ipv6_enabled = true,
$emc_ssl_cert_verify = undef,
$emc_ssl_cert_verify = $facts['os_service_default'],
$emc_ssl_cert_path = $facts['os_service_default'],
$package_ensure = 'present',
) {
@ -115,11 +115,6 @@ define manila::backend::dellemc_unity (
validate_legacy(String, 'validate_string', $emc_nas_password)
if $emc_ssl_cert_verify == undef {
warning('Default of emc_ssl_cert_verify will be changed from false to service default(true).')
}
$emc_ssl_cert_verify_real = pick($emc_ssl_cert_verify, false)
$unity_share_driver = 'manila.share.drivers.dell_emc.driver.EMCShareDriver'
manila_config {
@ -137,7 +132,7 @@ define manila::backend::dellemc_unity (
"${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_real;
"${share_backend_name}/emc_ssl_cert_verify": value => $emc_ssl_cert_verify;
"${share_backend_name}/emc_ssl_cert_path": value => $emc_ssl_cert_path;
}

11
manifests/backend/dellemc_vnx.pp
View File

@ -55,7 +55,7 @@
# [*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
# Defaults to $facts['os_service_default']
#
# [*emc_ssl_cert_path*]
# (optional) Can be used to specify a non default path to a
@ -94,7 +94,7 @@ define manila::backend::dellemc_vnx (
$vnx_share_data_pools = $facts['os_service_default'],
$vnx_ethernet_ports = $facts['os_service_default'],
$network_plugin_ipv6_enabled = true,
$emc_ssl_cert_verify = undef,
$emc_ssl_cert_verify = $facts['os_service_default'],
$emc_ssl_cert_path = $facts['os_service_default'],
$package_ensure = 'present',
$driver_handles_share_servers = undef,
@ -105,11 +105,6 @@ define manila::backend::dellemc_vnx (
validate_legacy(String, 'validate_string', $emc_nas_password)
if $emc_ssl_cert_verify == undef {
warning('Default of emc_ssl_cert_verify will be changed from false to service default(true).')
}
$emc_ssl_cert_verify_real = pick($emc_ssl_cert_verify, false)
if $driver_handles_share_servers != undef {
warning('The driver_handles_share_servers parameter has been deprecated and has no effect')
}
@ -129,7 +124,7 @@ define manila::backend::dellemc_vnx (
"${share_backend_name}/vnx_share_data_pools": value => join(any2array($vnx_share_data_pools), ',');
"${share_backend_name}/vnx_ethernet_ports": value => join(any2array($vnx_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_real;
"${share_backend_name}/emc_ssl_cert_verify": value => $emc_ssl_cert_verify;
"${share_backend_name}/emc_ssl_cert_path": value => $emc_ssl_cert_path;
}

10
releasenotes/notes/change-emc_ssl_cert_verify-update-63800b069921f44c.yaml Normal file
View File

@ -0,0 +1,10 @@
---
upgrade:
- |
Defaut value of the ``emc_ssl_cert_verify`` parameter in the following
resource types has been changed from ``false`` to service default which
is effectively ``true``.
- ``manila::backend::dellemc_unity``
- ``manila::backend::dellemc_vnx``

2
spec/defines/manila_backend_dellemc_unity_spec.rb
View File

@ -22,7 +22,7 @@ describe 'manila::backend::dellemc_unity' do
:unity_share_server => '<SERVICE DEFAULT>',
:report_default_filter_function => '<SERVICE DEFAULT>',
:network_plugin_ipv6_enabled => true,
:emc_ssl_cert_verify => false,
:emc_ssl_cert_verify => '<SERVICE DEFAULT>',
:emc_ssl_cert_path => '<SERVICE DEFAULT>',
:backend_availability_zone => '<SERVICE DEFAULT>',
}

2
spec/defines/manila_backend_dellemc_vnx_spec.rb
View File

@ -19,7 +19,7 @@ describe 'manila::backend::dellemc_vnx' do
:vnx_share_data_pools => '<SERVICE DEFAULT>',
:vnx_ethernet_ports => '<SERVICE DEFAULT>',
:network_plugin_ipv6_enabled => true,
:emc_ssl_cert_verify => false,
:emc_ssl_cert_verify => '<SERVICE DEFAULT>',
:emc_ssl_cert_path => '<SERVICE DEFAULT>',
:backend_availability_zone => '<SERVICE DEFAULT>',
}