openstack
/
puppet-cinder
Code Issues Proposed changes

Merge "NetApp: Deprecate parameters for E-Series systems"

This commit is contained in:
Zuul 2022-03-23 23:30:40 +00:00 committed by Gerrit Code Review
parent 871c94b1f2 6f10863bc4
commit c4486da3ec
3 changed files with 48 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
manifests/backend/netapp.pp
View File

@ -30,8 +30,7 @@
# [*netapp_server_port*]
# (optional) The TCP port to use for communication with the storage
# system or proxy. If not specified, Data ONTAP drivers will use 80
# for HTTP and 443 for HTTPS; E-Series will use 8080 for HTTP and
# 8443 for HTTPS.
# for HTTP and 443 for HTTPS;
# Defaults to 80
#
# [*netapp_size_multiplier*]
@ -41,9 +40,8 @@
# Defaults to 1.2
#
# [*netapp_storage_family*]
# (optional) The storage family type used on the storage system; valid values
# are ontap_cluster for using clustered Data ONTAP, or eseries for NetApp
# E-Series.
# (optional) The storage family type used on the storage system; valid value
# is ontap_cluster for using clustered Data ONTAP.
# Defaults to ontap_cluster
#
# [*netapp_storage_protocol*]
@ -103,18 +101,6 @@
# effective user of the cinder-volume process to execute the file.
# Defaults to undef
#
# [*netapp_controller_ips*]
# (optional) This option is only utilized when the storage family is
# configured to eseries. This option is used to restrict provisioning to the
# specified controllers. Specify the value of this option to be a comma
# separated list of controller hostnames or IP addresses to be used for
# provisioning.
# Defaults to undef
#
# [*netapp_sa_password*]
# (optional) Password for the NetApp E-Series storage array.
# Defaults to undef
#
# [*netapp_pool_name_search_pattern*]
# (optional) This option is only utilized when the Cinder driver is
# configured to use iSCSI or Fibre Channel. It is used to restrict
@ -130,14 +116,6 @@
# the particular operating system on the hosts that are connected to it.
# Defaults to $::os_service_default
#
# [*netapp_webservice_path*]
# (optional) This option is used to specify the path to the E-Series proxy
# application on a proxy server. The value is combined with the value of the
# netapp_transport_type, netapp_server_hostname, and netapp_server_port
# options to create the URL used by the driver to connect to the proxy
# application.
# Defaults to '/devmgr/v2'
#
# [*nas_secure_file_operations*]
# (Optional) Allow network-attached storage systems to operate in a secure
# environment where root level access is not permitted. If set to False,
@ -184,6 +162,26 @@
# required if the storage protocol selected is FC.
# Defaults to undef
#
# [*netapp_webservice_path*]
# (optional) This option is used to specify the path to the E-Series proxy
# application on a proxy server. The value is combined with the value of the
# netapp_transport_type, netapp_server_hostname, and netapp_server_port
# options to create the URL used by the driver to connect to the proxy
# application.
# Defaults to undef
#
# [*netapp_controller_ips*]
# (optional) This option is only utilized when the storage family is
# configured to eseries. This option is used to restrict provisioning to the
# specified controllers. Specify the value of this option to be a comma
# separated list of controller hostnames or IP addresses to be used for
# provisioning.
# Defaults to undef
#
# [*netapp_sa_password*]
# (optional) Password for the NetApp E-Series storage array.
# Defaults to undef
#
# === Examples
#
# cinder::backend::netapp { 'myBackend':
@ -222,10 +220,7 @@ define cinder::backend::netapp (
$nfs_shares_config = '/etc/cinder/shares.conf',
$nfs_mount_options = $::os_service_default,
$netapp_copyoffload_tool_path = undef,
$netapp_controller_ips = undef,
$netapp_sa_password = undef,
$netapp_host_type = $::os_service_default,
$netapp_webservice_path = '/devmgr/v2',
$manage_volume_type = false,
$extra_options = {},
$netapp_pool_name_search_pattern = '(.+)',
@ -234,15 +229,23 @@ define cinder::backend::netapp (
# DEPRECATED PARAMETERS
$netapp_vfiler = undef,
$netapp_partner_backend_name = undef,
$netapp_webservice_path = undef,
$netapp_controller_ips = undef,
$netapp_sa_password = undef,
) {
include cinder::deps
if $netapp_vfiler != undef {
warning('The netapp_vfiler parameter is deprecated and has no effect.')
}
if $netapp_partner_backend_name != undef {
warning('The netapp_partner_backend_name parameter is deprecated and has no effect.')
[
'netapp_vfilter',
'netapp_partner_backend_name',
'netapp_webservice_path',
'netapp_controller_ips',
'netapp_sa_password'
].each |String $dep_opt| {
if getvar($dep_opt) != undef {
warning("The ${dep_opt} parameter is deprecated and has no effect.")
}
}
if $nfs_shares {
@ -274,11 +277,8 @@ define cinder::backend::netapp (
"${name}/thres_avl_size_perc_stop": value => $thres_avl_size_perc_stop;
"${name}/nfs_shares_config": value => $nfs_shares_config;
"${name}/netapp_copyoffload_tool_path": value => $netapp_copyoffload_tool_path;
"${name}/netapp_controller_ips": value => $netapp_controller_ips;
"${name}/netapp_sa_password": value => $netapp_sa_password, secret => true;
"${name}/netapp_pool_name_search_pattern": value => $netapp_pool_name_search_pattern;
"${name}/netapp_host_type": value => $netapp_host_type;
"${name}/netapp_webservice_path": value => $netapp_webservice_path;
"${name}/nas_secure_file_operations": value => $nas_secure_file_operations;
"${name}/nas_secure_file_permissions": value => $nas_secure_file_permissions;
}
@ -286,6 +286,9 @@ define cinder::backend::netapp (
cinder_config {
"${name}/netapp_vfiler": ensure => absent;
"${name}/netapp_partner_backend_name": ensure => absent;
"${name}/netapp_webservice_path": ensure => absent;
"${name}/netapp_controller_ips": ensure => absent;
"${name}/netapp_sa_password": ensure => absent;
}
if $manage_volume_type {
@ -295,12 +298,6 @@ define cinder::backend::netapp (
}
}
if $netapp_storage_family == 'eseries' {
cinder_config {
"${name}/use_multipath_for_image_xfer": value => true;
}
}
create_resources('cinder_config', $extra_options)
}

9
releasenotes/notes/deprecate-netapp-eseries-cc877c5705f34931.yaml Normal file
View File

@ -0,0 +1,9 @@
---
deprecations:
- |
The following parameters of the ``cinder::backend::netapp`` resource type
have been deprecated and have no effect now.
- ``netapp_webservice_path``
- ``netapp_controller_ips``
- ``netapp_sa_password``

12
spec/defines/cinder_backend_netapp_spec.rb
View File

@ -12,8 +12,6 @@ describe 'cinder::backend::netapp' do
:netapp_server_hostname => '127.0.0.2',
:netapp_vserver => 'netapp_vserver',
:netapp_copyoffload_tool_path => '/tmp/na_copyoffload_64',
:netapp_controller_ips => '10.0.0.2,10.0.0.3',
:netapp_sa_password => 'password',
}
end
@ -30,7 +28,6 @@ describe 'cinder::backend::netapp' do
:thres_avl_size_perc_stop => '60',
:nfs_shares_config => '/etc/cinder/shares.conf',
:nfs_mount_options => '<SERVICE DEFAULT>',
:netapp_webservice_path => '/devmgr/v2',
:nas_secure_file_operations => '<SERVICE DEFAULT>',
:nas_secure_file_permissions => '<SERVICE DEFAULT>',
}
@ -51,7 +48,6 @@ describe 'cinder::backend::netapp' do
it {
is_expected.to contain_cinder_config('netapp/netapp_password').with_secret( true )
is_expected.to contain_cinder_config('netapp/netapp_sa_password').with_secret( true )
}
end
@ -68,14 +64,6 @@ describe 'cinder::backend::netapp' do
it_behaves_like 'netapp volume driver'
end
context 'with netapp_storage_family eseries' do
before do
params.merge!( :netapp_storage_family => 'eseries' )
end
it { is_expected.to contain_cinder_config('netapp/use_multipath_for_image_xfer').with_value('true') }
end
context 'with nfs_mount_options' do
before do
params.merge!( :nfs_mount_options => 'rw,proto=tcp,sec=sys' )