openstack
/
puppet-manila
Code Issues Proposed changes

[Dell EMC drivers] Define defaults for emc_share_backend 

Currently the emc_share_backend parameter is required. However this
parameter should be set according to the backend and because we provide
independent resource types for individual backends, the expected value
is predictable.

This change defines the default values and gets rid of that redundant
requirement. The parameter is still left so that this change can be
backportable.

Conflicts:
	manifests/backend/dellemc_isilon.pp
	manifests/backend/dellemc_vmax.pp
	manifests/backend/dellemc_vnx.pp
	spec/defines/manila_backend_dellemc_isilon_spec.rb
	spec/defines/manila_backend_dellemc_vmax_spec.rb
	spec/defines/manila_backend_dellemc_vnx_spec.rb

Change-Id: Ie71914a547377efd8933835aeaf8d08c5e917b12
(cherry picked from commit 3476785793)
(cherry picked from commit 57b1c81c6b)
(cherry picked from commit 319a849d28)
(cherry picked from commit 67993071a9)
(cherry picked from commit be6357e813)
This commit is contained in:
Takashi Kajinami 2021-11-17 08:44:02 +09:00
parent 4cbb038d6f
commit 89c305c5c7
8 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/backend/dellemc_isilon.pp
View File

@ -22,8 +22,8 @@
# (required) The hostname (or IP address) for the storage system.
#
# [*emc_share_backend*]
# (required) Share backend.
# Defaults to http
# (optional) Share backend.
# Defaults to 'isilon'
#
# [*share_backend_name*]
# (optional) Name of the backend in manila.conf that
@ -51,7 +51,6 @@
# emc_nas_login => 'admin',
# emc_nas_password => 'password',
# emc_nas_server => <IP address of isilon cluster>,
# emc_share_backend => 'isilon',
# }
#
define manila::backend::dellemc_isilon (
@ -59,7 +58,7 @@ define manila::backend::dellemc_isilon (
$emc_nas_login,
$emc_nas_password,
$emc_nas_server,
$emc_share_backend,
$emc_share_backend = 'isilon',
$share_backend_name = $name,
$emc_nas_root_dir = undef,
$emc_nas_server_port = 8080,

7
manifests/backend/dellemc_unity.pp
View File

@ -1,6 +1,6 @@
# == define: manila::backend::dellemc_unity
#
# Configures Manila to use the Dell EMC Isilon share driver
# Configures Manila to use the Dell EMC Unity share driver
# Compatible for multiple backends
#
# === Parameters
@ -23,7 +23,8 @@
# (required) The hostname (or IP address) for the storage system.
#
# [*emc_share_backend*]
# (required) Share backend.
# (optional) Share backend.
# Defaults to 'unity'
#
# [*share_backend_name*]
# (optional) Name of the backend in manila.conf that
@ -81,7 +82,7 @@ define manila::backend::dellemc_unity (
$emc_nas_login,
$emc_nas_password,
$emc_nas_server,
$emc_share_backend,
$emc_share_backend = 'unity',
$share_backend_name = $name,
$unity_server_meta_pool = undef,
$unity_share_data_pools = undef,

8
manifests/backend/dellemc_vmax.pp
View File

@ -1,6 +1,6 @@
# == define: manila::backend::dellemc_vmax
#
# Configures Manila to use the Dell EMC Isilon share driver
# Configures Manila to use the Dell EMC VMAX share driver
# Compatible for multiple backends
#
# === Parameters
@ -23,7 +23,8 @@
# (required) The hostname (or IP address) for the storage system.
#
# [*emc_share_backend*]
# (required) Share backend.
# (optional) Share backend.
# Defaults to 'vmax'
#
# [*share_backend_name*]
# (optional) Name of the backend in manila.conf that
@ -55,7 +56,6 @@
# emc_nas_login => 'admin',
# emc_nas_password => 'password',
# emc_nas_server => <IP address of Unity Syste,>,
# emc_share_backend => 'vmax',
# }
#
define manila::backend::dellemc_vmax (
@ -63,7 +63,7 @@ define manila::backend::dellemc_vmax (
$emc_nas_login,
$emc_nas_password,
$emc_nas_server,
$emc_share_backend,
$emc_share_backend = 'vmax',
$share_backend_name = $name,
$vmax_server_container = undef,
$vmax_share_data_pools = undef ,

6
manifests/backend/dellemc_vnx.pp
View File

@ -23,7 +23,8 @@
# (required) The hostname (or IP address) for the storage system.
#
# [*emc_share_backend*]
# (required) Share backend.
# (optional) Share backend.
# Defaults to 'vnx'
#
# [*share_backend_name*]
# (optional) Name of the backend in manila.conf that
@ -72,7 +73,6 @@
# emc_nas_login => 'admin',
# emc_nas_password => 'password',
# emc_nas_server => <IP address of Unity Syste,>,
# emc_share_backend => 'vnx',
# }
#
define manila::backend::dellemc_vnx (
@ -80,7 +80,7 @@ define manila::backend::dellemc_vnx (
$emc_nas_login,
$emc_nas_password,
$emc_nas_server,
$emc_share_backend,
$emc_share_backend = 'vnx',
$share_backend_name = $name,
$vnx_server_container = undef,
$vnx_share_data_pools = undef ,

6
spec/defines/manila_backend_dellemc_isilon_spec.rb
View File

@ -10,15 +10,15 @@ describe 'manila::backend::dellemc_isilon' do
:emc_nas_login => 'admin',
:emc_nas_password => 'password',
:emc_nas_server => '127.0.0.2',
:emc_share_backend => 'isilon',
:emc_nas_root_dir => '',
}
end
let :default_params do
{
:emc_nas_server_port => 8080,
:emc_nas_server_secure => true,
:emc_share_backend => 'isilon',
:emc_nas_server_port => 8080,
:emc_nas_server_secure => true,
}
end

2
spec/defines/manila_backend_dellemc_unity_spec.rb
View File

@ -10,7 +10,6 @@ describe 'manila::backend::dellemc_unity' do
:emc_nas_login => 'admin',
:emc_nas_password => 'password',
:emc_nas_server => '127.0.0.2',
:emc_share_backend => 'unity',
:unity_server_meta_pool => 'pool1',
:unity_share_data_pools => '*',
:unity_ethernet_ports => 'eth1',
@ -22,6 +21,7 @@ describe 'manila::backend::dellemc_unity' do
let :default_params do
{
:emc_share_backend => 'unity',
:unity_server_meta_pool => '<SERVICE DEFAULT>',
:unity_share_data_pools => '<SERVICE DEFAULT>',
:unity_ethernet_ports => '<SERVICE DEFAULT>',

8
spec/defines/manila_backend_dellemc_vmax_spec.rb
View File

@ -10,7 +10,6 @@ describe 'manila::backend::dellemc_vmax' do
:emc_nas_login => 'admin',
:emc_nas_password => 'password',
:emc_nas_server => '127.0.0.2',
:emc_share_backend => 'vmax',
:vmax_server_container => 'container1',
:vmax_share_data_pools => '*',
:vmax_ethernet_ports => 'eth1',
@ -19,9 +18,10 @@ describe 'manila::backend::dellemc_vmax' do
let :default_params do
{
:vmax_server_container => '<SERVICE DEFAULT>',
:vmax_share_data_pools => '<SERVICE DEFAULT>',
:vmax_ethernet_ports => '<SERVICE DEFAULT>',
:emc_share_backend => 'vmax',
:vmax_server_container => '<SERVICE DEFAULT>',
:vmax_share_data_pools => '<SERVICE DEFAULT>',
:vmax_ethernet_ports => '<SERVICE DEFAULT>',
}
end

2
spec/defines/manila_backend_dellemc_vnx_spec.rb
View File

@ -10,7 +10,6 @@ describe 'manila::backend::dellemc_vnx' do
:emc_nas_login => 'admin',
:emc_nas_password => 'password',
:emc_nas_server => '127.0.0.2',
:emc_share_backend => 'vnx',
:vnx_server_container => 'container1',
:vnx_share_data_pools => '*',
:vnx_ethernet_ports => 'eth1',
@ -22,6 +21,7 @@ describe 'manila::backend::dellemc_vnx' do
let :default_params do
{
:emc_share_backend => 'vnx',
:vnx_server_container => '<SERVICE DEFAULT>',
:vnx_share_data_pools => '<SERVICE DEFAULT>',
:vnx_ethernet_ports => '<SERVICE DEFAULT>',