openstack/puppet-cinder
Code Issues Proposed changes

NetApp: Use netapp_host_type

Browse Source 
This patch deprecates netapp_eseries_host_type in favor of
netapp_host_type. As the default value for netapp_host_type is
set to 'undef', per-driver defaults are picked if no values are
passed to cinder::backend::netapp.

Closes-Bug: #1579161
Change-Id: I4c4dea024dbef08219641569ddec265e473e7b58
This commit is contained in:
Arne Wiebalck 2016-05-18 14:35:40 +02:00
parent 5278c9da8f
commit 8a29eb7b8d
5 changed files with 50 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
manifests/backend/netapp.pp
View File

@ -139,11 +139,10 @@
# used for provisioning.
# Defaults to undef
#
# [*netapp_eseries_host_type*]
# (optional) This option is used to define how the controllers in the
# E-Series storage array will work with the particular operating system on
# the hosts that are connected to it.
# Defaults to 'linux_dm_mp'
# [*netapp_host_type*]
# (optional) This option is used to define how the controllers will work with
# 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
@ -159,6 +158,14 @@
# Example :
# { 'netapp_backend/param1' => { 'value' => value1 } }
#
# DEPRECATED PARAMETERS
#
# [*netapp_eseries_host_type*]
# (optional) Deprecated. This option is used to define how the controllers in
# the E-Series storage array will work with the particular operating system on
# the hosts that are connected to it.
# Defaults to undef
#
# === Examples
#
# cinder::backend::netapp { 'myBackend':
@ -202,11 +209,20 @@ define cinder::backend::netapp (
$netapp_controller_ips = undef,
$netapp_sa_password = undef,
$netapp_storage_pools = undef,
$netapp_eseries_host_type = 'linux_dm_mp',
$netapp_host_type = $::os_service_default,
$netapp_webservice_path = '/devmgr/v2',
$extra_options = {},
# DEPRECATED PARAMETERS
$netapp_eseries_host_type = undef,
) {
if $netapp_eseries_host_type {
warning('The "netapp_eseries_host_type" parameter is deprecated. Use "netapp_host_type" instead.')
$netapp_host_type_real = $netapp_eseries_host_type
} else {
$netapp_host_type_real = $netapp_host_type
}
if $nfs_shares {
validate_array($nfs_shares)
file {$nfs_shares_config:
@ -240,7 +256,7 @@ define cinder::backend::netapp (
"${name}/netapp_controller_ips": value => $netapp_controller_ips;
"${name}/netapp_sa_password": value => $netapp_sa_password, secret => true;
"${name}/netapp_storage_pools": value => $netapp_storage_pools;
"${name}/netapp_eseries_host_type": value => $netapp_eseries_host_type;
"${name}/netapp_host_type": value => $netapp_host_type_real;
"${name}/netapp_webservice_path": value => $netapp_webservice_path;
}

30
manifests/volume/netapp.pp
View File

@ -134,11 +134,10 @@
# used for provisioning.
# Defaults to undef
#
# [*netapp_eseries_host_type*]
# (optional) This option is used to define how the controllers in the
# E-Series storage array will work with the particular operating system on
# the hosts that are connected to it.
# Defaults to 'linux_dm_mp'
# [*netapp_host_type*]
# (optional) This option is used to define how the controllers will work with
# 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
@ -154,6 +153,14 @@
# Example :
# { 'netapp_backend/param1' => { 'value' => value1 } }
#
# DEPRECATED PARAMETERS
#
# [*netapp_eseries_host_type*]
# (optional) Deprecated. This option is used to define how the controllers in
# the E-Series storage array will work with the particular operating system on
# the hosts that are connected to it.
# Defaults to undef
#
# === Examples
#
# class { 'cinder::volume::netapp':
@ -195,12 +202,21 @@ class cinder::volume::netapp (
$netapp_controller_ips = undef,
$netapp_sa_password = undef,
$netapp_storage_pools = undef,
$netapp_eseries_host_type = 'linux_dm_mp',
$netapp_host_type = $::os_service_default,
$netapp_webservice_path = '/devmgr/v2',
$nfs_mount_options = undef,
$extra_options = {},
# DEPRECATED PARAMETERS
$netapp_eseries_host_type = undef,
) {
if $netapp_eseries_host_type {
warning('The "netapp_eseries_host_type" parameter is deprecated. Use "netapp_host_type" instead.')
$netapp_host_type_real = $netapp_eseries_host_type
} else {
$netapp_host_type_real = $netapp_host_type
}
cinder::backend::netapp { 'DEFAULT':
netapp_login => $netapp_login,
netapp_password => $netapp_password,
@ -223,7 +239,7 @@ class cinder::volume::netapp (
netapp_controller_ips => $netapp_controller_ips,
netapp_sa_password => $netapp_sa_password,
netapp_storage_pools => $netapp_storage_pools,
netapp_eseries_host_type => $netapp_eseries_host_type,
netapp_host_type => $netapp_host_type_real,
netapp_webservice_path => $netapp_webservice_path,
nfs_mount_options => $nfs_mount_options,
extra_options => $extra_options,

4
releasenotes/notes/netapp_deprecation_newton-34c2b89e6d4d3c82.yaml Normal file
View File

@ -0,0 +1,4 @@
---
deprecations:
- netapp_eseries_host_type parameter is deprecated in favor
of netapp_host_type.

1
spec/classes/cinder_volume_netapp_spec.rb
View File

@ -33,7 +33,6 @@ describe 'cinder::volume::netapp' do
:thres_avl_size_perc_start => '20',
:thres_avl_size_perc_stop => '60',
:nfs_shares_config => '/etc/cinder/shares.conf',
:netapp_eseries_host_type => 'linux_dm_mp',
:nfs_mount_options => '<SERVICE DEFAULT>',
:netapp_webservice_path => '/devmgr/v2',
}

1
spec/defines/cinder_backend_netapp_spec.rb
View File

@ -36,7 +36,6 @@ describe 'cinder::backend::netapp' do
:thres_avl_size_perc_start => '20',
:thres_avl_size_perc_stop => '60',
:nfs_shares_config => '/etc/cinder/shares.conf',
:netapp_eseries_host_type => 'linux_dm_mp',
:nfs_mount_options => '<SERVICE DEFAULT>',
:netapp_webservice_path => '/devmgr/v2',
}