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.

Change-Id: Ie71914a547377efd8933835aeaf8d08c5e917b12
This commit is contained in:
Takashi Kajinami 2021-11-17 08:44:02 +09:00
parent f65d50563f
commit 3476785793
8 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/backend/dellemc_isilon.pp
View File

@ -17,8 +17,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
@ -58,14 +58,13 @@
# 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 (
$emc_nas_login,
$emc_nas_password,
$emc_nas_server,
$emc_share_backend,
$emc_share_backend = 'isilon',
$share_backend_name = $name,
$backend_availability_zone = $::os_service_default,
$emc_nas_root_dir = $::os_service_default,

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
@ -87,7 +88,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,
$backend_availability_zone = $::os_service_default,
$unity_server_meta_pool = 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
@ -17,7 +17,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
@ -62,14 +63,13 @@
# 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 (
$emc_nas_login,
$emc_nas_password,
$emc_nas_server,
$emc_share_backend,
$emc_share_backend = 'vmax',
$share_backend_name = $name,
$backend_availability_zone = $::os_service_default,
$vmax_server_container = $::os_service_default,

6
manifests/backend/dellemc_vnx.pp
View File

@ -17,7 +17,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
@ -80,14 +81,13 @@
# 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 (
$emc_nas_login,
$emc_nas_password,
$emc_nas_server,
$emc_share_backend,
$emc_share_backend = 'vnx',
$share_backend_name = $name,
$backend_availability_zone = $::os_service_default,
$vnx_server_container = $::os_service_default,

2
spec/defines/manila_backend_dellemc_isilon_spec.rb
View File

@ -9,12 +9,12 @@ 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',
}
end
let :default_params do
{
:emc_share_backend => 'isilon',
:backend_availability_zone => '<SERVICE DEFAULT>',
:emc_nas_root_dir => '<SERVICE DEFAULT>',
:emc_nas_server_port => 8080,

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',
@ -23,6 +22,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>',

2
spec/defines/manila_backend_dellemc_vmax_spec.rb
View File

@ -9,12 +9,12 @@ 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',
}
end
let :default_params do
{
:emc_share_backend => 'vmax',
:vmax_server_container => '<SERVICE DEFAULT>',
:vmax_share_data_pools => '<SERVICE DEFAULT>',
:vmax_ethernet_ports => '<SERVICE DEFAULT>',

2
spec/defines/manila_backend_dellemc_vnx_spec.rb
View File

@ -9,12 +9,12 @@ 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',
}
end
let :default_params do
{
:emc_share_backend => 'vnx',
:vnx_server_container => '<SERVICE DEFAULT>',
:vnx_share_data_pools => '<SERVICE DEFAULT>',
:vnx_ethernet_ports => '<SERVICE DEFAULT>',