openstack
/
puppet-manila
Code Issues Proposed changes

Merge "Add ability to configure backend availability zones"

This commit is contained in:
Zuul 2021-09-27 17:02:48 +00:00 committed by Gerrit Code Review
parent 76fd935798 a0610b687e
commit e8a57ea0c3
27 changed files with 156 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/backend/cephfs.pp
View File

@ -13,6 +13,12 @@
# these settings will reside in
# Defaults to: $name
#
# [*backend_availability_zone*]
# (Optional) Availability zone for this share backend.
# If not set, the storage_availability_zone option value
# is used as the default for all backends.
# Defaults to $::os_service_default.
#
# [*cephfs_conf_path*]
# (optional) Path to cephfs config.
# Defaults to: $state_path/ceph.conf
@ -65,6 +71,7 @@
define manila::backend::cephfs (
$driver_handles_share_servers = false,
$share_backend_name = $name,
$backend_availability_zone = $::os_service_default,
$cephfs_conf_path = '$state_path/ceph.conf',
$cephfs_auth_id = 'manila',
$cephfs_cluster_name = 'ceph',
@ -85,6 +92,7 @@ define manila::backend::cephfs (
manila_config {
"${name}/driver_handles_share_servers": value => $driver_handles_share_servers;
"${name}/share_backend_name": value => $share_backend_name;
"${name}/backend_availability_zone": value => $backend_availability_zone;
"${name}/share_driver": value => $share_driver;
"${name}/cephfs_conf_path": value => $cephfs_conf_path;
"${name}/cephfs_auth_id": value => $cephfs_auth_id;

8
manifests/backend/dellemc_isilon.pp
View File

@ -24,6 +24,12 @@
# (optional) Name of the backend in manila.conf that
# these settings will reside in
#
# [*backend_availability_zone*]
# (Optional) Availability zone for this share backend.
# If not set, the storage_availability_zone option value
# is used as the default for all backends.
# Defaults to $::os_service_default.
#
# [*emc_nas_root_dir*]
# (optional) The root directory where shares will be located.
# Defaults to $::os_service_default
@ -61,6 +67,7 @@ define manila::backend::dellemc_isilon (
$emc_nas_server,
$emc_share_backend,
$share_backend_name = $name,
$backend_availability_zone = $::os_service_default,
$emc_nas_root_dir = $::os_service_default,
$emc_nas_server_port = 8080,
$emc_nas_server_secure = true,
@ -87,6 +94,7 @@ define manila::backend::dellemc_isilon (
"${share_backend_name}/emc_nas_password": value => $emc_nas_password, secret => true;
"${share_backend_name}/emc_nas_server": value => $emc_nas_server;
"${share_backend_name}/share_backend_name": value => $share_backend_name;
"${share_backend_name}/backend_availability_zone": value => $backend_availability_zone;
"${share_backend_name}/emc_share_backend": value => $emc_share_backend;
"${share_backend_name}/emc_nas_root_dir": value => $emc_nas_root_dir;
"${share_backend_name}/emc_nas_server_port": value => $emc_nas_server_port;

8
manifests/backend/dellemc_unity.pp
View File

@ -29,6 +29,12 @@
# (optional) Name of the backend in manila.conf that
# these settings will reside in
#
# [*backend_availability_zone*]
# (Optional) Availability zone for this share backend.
# If not set, the storage_availability_zone option value
# is used as the default for all backends.
# Defaults to $::os_service_default.
#
# [*unity_server_meta_pool*]
# (optional) The name of the pool to persist the meta-data of NAS server.
# Defaults to None
@ -83,6 +89,7 @@ define manila::backend::dellemc_unity (
$emc_nas_server,
$emc_share_backend,
$share_backend_name = $name,
$backend_availability_zone = $::os_service_default,
$unity_server_meta_pool = undef,
$unity_share_data_pools = undef,
$unity_ethernet_ports = undef,
@ -106,6 +113,7 @@ define manila::backend::dellemc_unity (
"${share_backend_name}/emc_nas_password": value => $emc_nas_password, secret => true;
"${share_backend_name}/emc_nas_server": value => $emc_nas_server;
"${share_backend_name}/share_backend_name": value => $share_backend_name;
"${share_backend_name}/backend_availability_zone": value => $backend_availability_zone;
"${share_backend_name}/emc_share_backend": value => $emc_share_backend;
"${share_backend_name}/unity_server_meta_pool": value => $unity_server_meta_pool;
"${share_backend_name}/unity_share_data_pools": value => $unity_share_data_pools;

8
manifests/backend/dellemc_vmax.pp
View File

@ -23,6 +23,12 @@
# (optional) Name of the backend in manila.conf that
# these settings will reside in
#
# [*backend_availability_zone*]
# (Optional) Availability zone for this share backend.
# If not set, the storage_availability_zone option value
# is used as the default for all backends.
# Defaults to $::os_service_default.
#
# [*vmax_server_container*]
# (optional) Name of the Data Mover to serve the share service.
# Defaults to $::os_service_default
@ -65,6 +71,7 @@ define manila::backend::dellemc_vmax (
$emc_nas_server,
$emc_share_backend,
$share_backend_name = $name,
$backend_availability_zone = $::os_service_default,
$vmax_server_container = $::os_service_default,
$vmax_share_data_pools = $::os_service_default,
$vmax_ethernet_ports = $::os_service_default,
@ -90,6 +97,7 @@ define manila::backend::dellemc_vmax (
"${share_backend_name}/emc_nas_password": value => $emc_nas_password, secret => true;
"${share_backend_name}/emc_nas_server": value => $emc_nas_server;
"${share_backend_name}/share_backend_name": value => $share_backend_name;
"${share_backend_name}/backend_availability_zone": value => $backend_availability_zone;
"${share_backend_name}/emc_share_backend": value => $emc_share_backend;
"${share_backend_name}/vmax_server_container": value => $vmax_server_container;
"${share_backend_name}/vmax_share_data_pools": value => $vmax_share_data_pools;

8
manifests/backend/dellemc_vnx.pp
View File

@ -23,6 +23,12 @@
# (optional) Name of the backend in manila.conf that
# these settings will reside in
#
# [*backend_availability_zone*]
# (Optional) Availability zone for this share backend.
# If not set, the storage_availability_zone option value
# is used as the default for all backends.
# Defaults to $::os_service_default.
#
# [*vnx_server_container*]
# (optional) Name of the Data Mover to serve the share service.
# Defaults to $::os_service_default
@ -83,6 +89,7 @@ define manila::backend::dellemc_vnx (
$emc_nas_server,
$emc_share_backend,
$share_backend_name = $name,
$backend_availability_zone = $::os_service_default,
$vnx_server_container = $::os_service_default,
$vnx_share_data_pools = $::os_service_default,
$vnx_ethernet_ports = $::os_service_default,
@ -111,6 +118,7 @@ define manila::backend::dellemc_vnx (
"${share_backend_name}/emc_nas_password": value => $emc_nas_password, secret => true;
"${share_backend_name}/emc_nas_server": value => $emc_nas_server;
"${share_backend_name}/share_backend_name": value => $share_backend_name;
"${share_backend_name}/backend_availability_zone": value => $backend_availability_zone;
"${share_backend_name}/emc_share_backend": value => $emc_share_backend;
"${share_backend_name}/vnx_server_container": value => $vnx_server_container;
"${share_backend_name}/vnx_share_data_pools": value => $vnx_share_data_pools;

14
manifests/backend/flashblade.pp
View File

@ -18,6 +18,12 @@
# (optional) Name of the backend in manila.conf that
# these settings will reside in
#
# [*backend_availability_zone*]
# (Optional) Availability zone for this share backend.
# If not set, the storage_availability_zone option value
# is used as the default for all backends.
# Defaults to $::os_service_default.
#
# [*flashblade_eradicate*]
# (optional) Fully eradicate deleted shares and snapshots.
# Defaults to True
@ -37,9 +43,10 @@ define manila::backend::flashblade (
$flashblade_api,
$flashblade_data_vip,
$flashblade_mgmt_vip,
$flashblade_eradicate = true,
$share_backend_name = $name,
$package_ensure = 'present',
$flashblade_eradicate = true,
$share_backend_name = $name,
$backend_availability_zone = $::os_service_default,
$package_ensure = 'present',
) {
include manila::deps
@ -57,6 +64,7 @@ define manila::backend::flashblade (
"${share_backend_name}/flashblade_mgmt_vip": value => $flashblade_mgmt_vip;
"${share_backend_name}/flashblade_data_vip": value => $flashblade_data_vip;
"${share_backend_name}/share_backend_name": value => $share_backend_name;
"${share_backend_name}/backend_availability_zone": value => $backend_availability_zone;
}
ensure_packages('nfs-client', {

8
manifests/backend/generic.pp
View File

@ -11,6 +11,12 @@
# (optional) Name of the backend in manila.conf that
# these settings will reside in
#
# [*backend_availability_zone*]
# (Optional) Availability zone for this share backend.
# If not set, the storage_availability_zone option value
# is used as the default for all backends.
# Defaults to $::os_service_default.
#
# [*smb_template_config_path*]
# (optional) Path to smb config.
# Defaults to: $state_path/smb.conf
@ -72,6 +78,7 @@
define manila::backend::generic (
$driver_handles_share_servers,
$share_backend_name = $name,
$backend_availability_zone = $::os_service_default,
$smb_template_config_path = '$state_path/smb.conf',
$volume_name_template = 'manila-share-%s',
$volume_snapshot_name_template = 'manila-snapshot-%s',
@ -95,6 +102,7 @@ define manila::backend::generic (
manila_config {
"${name}/driver_handles_share_servers": value => $driver_handles_share_servers;
"${name}/share_backend_name": value => $share_backend_name;
"${name}/backend_availability_zone": value => $backend_availability_zone;
"${name}/share_driver": value => $share_driver;
"${name}/smb_template_config_path": value => $smb_template_config_path;
"${name}/volume_name_template": value => $volume_name_template;

8
manifests/backend/glusterfs.pp
View File

@ -8,6 +8,12 @@
# (optional) Name of the backend in manila.conf that
# these settings will reside in
#
# [*backend_availability_zone*]
# (Optional) Availability zone for this share backend.
# If not set, the storage_availability_zone option value
# is used as the default for all backends.
# Defaults to $::os_service_default.
#
# [*glusterfs_volumes_config*]
# (required) File with the list of Gluster volumes that can be used to
# create shares
@ -24,6 +30,7 @@
#
define manila::backend::glusterfs (
$share_backend_name = $name,
$backend_availability_zone = $::os_service_default,
$glusterfs_volumes_config = '/etc/manila/glusterfs_volumes',
$glusterfs_mount_point_base = '$state_path/mnt',
) {
@ -33,6 +40,7 @@ define manila::backend::glusterfs (
manila_config {
"${name}/share_backend_name": value => $share_backend_name;
"${name}/backend_availability_zone": value => $backend_availability_zone;
"${name}/share_driver": value => $share_driver;
"${name}/glusterfs_volumes_config": value => $glusterfs_volumes_config;
"${name}/glusterfs_mount_point_base": value => $glusterfs_mount_point_base;

8
manifests/backend/glusternative.pp
View File

@ -8,6 +8,12 @@
# (optional) Name of the backend in manila.conf that
# these settings will reside in
#
# [*backend_availability_zone*]
# (Optional) Availability zone for this share backend.
# If not set, the storage_availability_zone option value
# is used as the default for all backends.
# Defaults to $::os_service_default.
#
# [*glusterfs_servers*]
# (required) List of GlusterFS servers that can be used to create shares.
# Each GlusterFS server should be of the form [remoteuser@]<volserver>, and
@ -34,6 +40,7 @@ define manila::backend::glusternative (
$glusterfs_servers,
$glusterfs_volume_pattern,
$share_backend_name = $name,
$backend_availability_zone = $::os_service_default,
$package_ensure = 'present',
$glusterfs_path_to_private_key = undef,
# DEPRECATED PARAMETERS
@ -53,6 +60,7 @@ define manila::backend::glusternative (
manila_config {
"${share_backend_name}/share_backend_name": value => $share_backend_name;
"${share_backend_name}/backend_availability_zone": value => $backend_availability_zone;
"${share_backend_name}/share_driver": value => $share_driver;
"${share_backend_name}/glusterfs_servers": value => $glusterfs_servers;
"${share_backend_name}/glusterfs_path_to_private_key": value => $glusterfs_path_to_private_key_real;

12
manifests/backend/glusternfs.pp
View File

@ -28,6 +28,12 @@
# [*share_backend_name*]
# (optional) Backend name in manila.conf where these settings will reside in.
#
# [*backend_availability_zone*]
# (Optional) Availability zone for this share backend.
# If not set, the storage_availability_zone option value
# is used as the default for all backends.
# Defaults to $::os_service_default.
#
# [*package_ensure*]
# (optional) Ensure state for package. Defaults to 'present'.
#
@ -38,8 +44,9 @@ define manila::backend::glusternfs (
$glusterfs_nfs_server_type,
$glusterfs_path_to_private_key,
$glusterfs_ganesha_server_ip,
$share_backend_name = $name,
$package_ensure = 'present',
$share_backend_name = $name,
$backend_availability_zone = $::os_service_default,
$package_ensure = 'present',
) {
include manila::deps
@ -49,6 +56,7 @@ define manila::backend::glusternfs (
manila_config {
"${share_backend_name}/share_backend_name": value => $share_backend_name;
"${share_backend_name}/backend_availability_zone": value => $backend_availability_zone;
"${share_backend_name}/share_driver": value => $share_driver;
"${share_backend_name}/glusterfs_target": value => $glusterfs_target;
"${share_backend_name}/glusterfs_mount_point_base": value => $glusterfs_mount_point_base;

8
manifests/backend/hitachi_hnas.pp
View File

@ -34,6 +34,12 @@
# (optional) Name of the backend in manila.conf that
# these settings will reside in
#
# [*backend_availability_zone*]
# (Optional) Availability zone for this share backend.
# If not set, the storage_availability_zone option value
# is used as the default for all backends.
# Defaults to $::os_service_default.
#
# [*package_ensure*]
# (optional) Ensure state for package. Defaults to 'present'.
#
@ -58,6 +64,7 @@ define manila::backend::hitachi_hnas (
$hitachi_hnas_file_system_name,
$driver_handles_share_servers = false,
$share_backend_name = $name,
$backend_availability_zone = $::os_service_default,
$package_ensure = 'present',
) {
@ -71,6 +78,7 @@ define manila::backend::hitachi_hnas (
manila_config {
"${share_backend_name}/share_driver": value => $hitachi_share_driver;
"${share_backend_name}/driver_handles_share_servers": value => $driver_handles_share_servers;
"${share_backend_name}/backend_availability_zone": value => $backend_availability_zone;
"${share_backend_name}/hitachi_hnas_username": value => $hitachi_hnas_username;
"${share_backend_name}/hitachi_hnas_password": value => $hitachi_hnas_password, secret => true;
"${share_backend_name}/hitachi_hnas_ip": value => $hitachi_hnas_ip;

8
manifests/backend/lvm.pp
View File

@ -12,6 +12,12 @@
# reside in.
# Defaults to: $name
#
# [*backend_availability_zone*]
# (Optional) Availability zone for this share backend.
# If not set, the storage_availability_zone option value
# is used as the default for all backends.
# Defaults to $::os_service_default.
#
# [*driver_handles_share_servers*]
# (optional) Denotes whether the driver should handle the responsibility of
# managing share servers. This must be set to false if the driver is to
@ -38,6 +44,7 @@
define manila::backend::lvm (
$lvm_share_export_ips,
$share_backend_name = $name,
$backend_availability_zone = $::os_service_default,
$driver_handles_share_servers = $::os_service_default,
$lvm_share_export_root = $::os_service_default,
$lvm_share_mirrors = $::os_service_default,
@ -50,6 +57,7 @@ define manila::backend::lvm (
manila_config {
"${name}/share_backend_name": value => $share_backend_name;
"${name}/backend_availability_zone": value => $backend_availability_zone;
"${name}/share_driver": value => $share_driver;
"${name}/driver_handles_share_servers": value => $driver_handles_share_servers;
"${name}/lvm_share_export_ips": value => join(any2array($lvm_share_export_ips),',');

8
manifests/backend/netapp.pp
View File

@ -25,6 +25,12 @@
# (optional) Name of the backend in manila.conf that
# these settings will reside in
#
# [*backend_availability_zone*]
# (Optional) Availability zone for this share backend.
# If not set, the storage_availability_zone option value
# is used as the default for all backends.
# Defaults to $::os_service_default.
#
# [*netapp_transport_type*]
# (optional) The transport protocol used when communicating with
# the storage system or proxy server. Valid values are
@ -113,6 +119,7 @@ define manila::backend::netapp (
$netapp_password,
$netapp_server_hostname,
$share_backend_name = $name,
$backend_availability_zone = $::os_service_default,
$netapp_transport_type = 'http',
$netapp_storage_family = 'ontap_cluster',
$netapp_server_port = undef,
@ -150,6 +157,7 @@ define manila::backend::netapp (
"${share_backend_name}/netapp_password": value => $netapp_password, secret => true;
"${share_backend_name}/netapp_server_hostname": value => $netapp_server_hostname;
"${share_backend_name}/share_backend_name": value => $share_backend_name;
"${share_backend_name}/backend_availability_zone": value => $backend_availability_zone;
"${share_backend_name}/netapp_transport_type": value => $netapp_transport_type;
"${share_backend_name}/netapp_storage_family": value => $netapp_storage_family;
"${share_backend_name}/netapp_server_port": value => $netapp_server_port;

6
releasenotes/notes/add-share-backend-availability-zone-parameters-1bcf6b1066dc82cf.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
Add new "backend_availability_zone" parameter to every share
backend. The parameters are optional, and when set they override the
DEFAULT/storage_availability_zone for the corresponding backend.

3
spec/defines/manila_backend_cephfs_spec.rb
View File

@ -8,6 +8,7 @@ describe 'manila::backend::cephfs' do
{
:driver_handles_share_servers => false,
:share_backend_name => 'cephfs',
:backend_availability_zone => 'my_zone',
:cephfs_conf_path => '$state_path/ceph.conf',
:cephfs_auth_id => 'manila',
:cephfs_cluster_name => 'ceph',
@ -26,6 +27,8 @@ describe 'manila::backend::cephfs' do
'manila.share.drivers.cephfs.driver.CephFSDriver')
is_expected.to contain_manila_config('cephfs/share_backend_name').with_value(
'cephfs')
is_expected.to contain_manila_config('cephfs/backend_availability_zone').with_value(
'my_zone')
is_expected.to contain_manila_config('cephfs/cephfs_conf_path').with_value(
'$state_path/ceph.conf')
is_expected.to contain_manila_config('cephfs/cephfs_auth_id').with_value(

14
spec/defines/manila_backend_dellemc_isilon_spec.rb
View File

@ -15,9 +15,10 @@ describe 'manila::backend::dellemc_isilon' do
let :default_params do
{
:emc_nas_root_dir => '<SERVICE DEFAULT>',
:emc_nas_server_port => 8080,
:emc_nas_server_secure => true,
:backend_availability_zone => '<SERVICE DEFAULT>',
:emc_nas_root_dir => '<SERVICE DEFAULT>',
:emc_nas_server_port => 8080,
:emc_nas_server_secure => true,
}
end
@ -52,9 +53,10 @@ describe 'manila::backend::dellemc_isilon' do
context 'with provided parameters' do
let :params do
required_params.merge!({
:emc_nas_root_dir => 'myroot',
:emc_nas_server_port => 8000,
:emc_nas_server_secure => false,
:emc_nas_root_dir => 'myroot',
:emc_nas_server_port => 8000,
:emc_nas_server_secure => false,
:backend_availability_zone => 'my_zone',
})
end

2
spec/defines/manila_backend_dellemc_unity_spec.rb
View File

@ -17,6 +17,7 @@ describe 'manila::backend::dellemc_unity' do
:network_plugin_ipv6_enabled => true,
:emc_ssl_cert_verify => true,
:emc_ssl_cert_path => '/etc/ssl/certs/',
:backend_availability_zone => 'my_zone',
}
end
@ -28,6 +29,7 @@ describe 'manila::backend::dellemc_unity' do
:network_plugin_ipv6_enabled => '<SERVICE DEFAULT>',
:emc_ssl_cert_verify => '<SERVICE DEFAULT>',
:emc_ssl_cert_path => '<SERVICE DEFAULT>',
:backend_availability_zone => '<SERVICE DEFAULT>',
}
end

14
spec/defines/manila_backend_dellemc_vmax_spec.rb
View File

@ -15,9 +15,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>',
:vmax_server_container => '<SERVICE DEFAULT>',
:vmax_share_data_pools => '<SERVICE DEFAULT>',
:vmax_ethernet_ports => '<SERVICE DEFAULT>',
:backend_availability_zone => '<SERVICE DEFAULT>',
}
end
@ -52,9 +53,10 @@ describe 'manila::backend::dellemc_vmax' do
context 'with provided parameters' do
let :params do
required_params.merge!({
:vmax_server_container => 'container1',
:vmax_share_data_pools => '*',
:vmax_ethernet_ports => 'eth1',
:vmax_server_container => 'container1',
:vmax_share_data_pools => '*',
:vmax_ethernet_ports => 'eth1',
:backend_availability_zone => 'my_zone',
})
end

2
spec/defines/manila_backend_dellemc_vnx_spec.rb
View File

@ -21,6 +21,7 @@ describe 'manila::backend::dellemc_vnx' do
:network_plugin_ipv6_enabled => true,
:emc_ssl_cert_verify => false,
:emc_ssl_cert_path => '<SERVICE DEFAULT>',
:backend_availability_zone => '<SERVICE DEFAULT>',
}
end
@ -61,6 +62,7 @@ describe 'manila::backend::dellemc_vnx' do
:network_plugin_ipv6_enabled => true,
:emc_ssl_cert_verify => true,
:emc_ssl_cert_path => '/etc/ssl/certs/',
:backend_availability_zone => 'my_zone',
})
end

8
spec/defines/manila_backend_flashblade_spec.rb
View File

@ -6,7 +6,7 @@ describe 'manila::backend::flashblade' do
let :required_params do
{
:flashblade_api => 'admin',
:flashblade_api => 'admin',
:flashblade_mgmt_vip => '10.1.1.1',
:flashblade_data_vip => '10.1.1.2',
}
@ -14,7 +14,8 @@ describe 'manila::backend::flashblade' do
let :default_params do
{
:flashblade_eradicate => true,
:flashblade_eradicate => true,
:backend_availability_zone => '<SERVICE DEFAULT>',
}
end
@ -49,7 +50,8 @@ describe 'manila::backend::flashblade' do
context 'with share server config' do
let :params do
required_params.merge!({
:flashblade_eradicate => true,
:flashblade_eradicate => true,
:backend_availability_zone => 'my_zone',
})
end

2
spec/defines/manila_backend_generic_spec.rb
View File

@ -16,10 +16,12 @@ describe 'manila::backend::generic' do
:service_instance_smb_config_path => '$share_mount_path/smb.conf',
:share_volume_fstype => 'ext4',
:cinder_volume_type => 'gold',
:backend_availability_zone => 'my_zone',
}
end
shared_examples 'manila::backend::generic' do
context 'generic share driver' do
it 'configures generic share driver' do
is_expected.to contain_manila_config('hippo/share_backend_name').with(

3
spec/defines/manila_backend_glusterfs_spec.rb
View File

@ -9,6 +9,7 @@ describe 'manila::backend::glusterfs' do
{
:glusterfs_volumes_config => '/etc/manila/glusterfs_volumes',
:glusterfs_mount_point_base => '$state_path/mnt',
:backend_availability_zone => 'my_zone',
}
end
@ -21,6 +22,8 @@ describe 'manila::backend::glusterfs' do
'/etc/manila/glusterfs_volumes')
is_expected.to contain_manila_config('mygluster/glusterfs_mount_point_base').with_value(
'$state_path/mnt')
is_expected.to contain_manila_config('mygluster/backend_availability_zone').with_value(
'my_zone')
end
end

1
spec/defines/manila_backend_glusternative_spec.rb
View File

@ -10,6 +10,7 @@ describe 'manila::backend::glusternative' do
:glusterfs_servers => 'remoteuser@volserver',
:glusterfs_path_to_private_key => '/etc/glusterfs/glusterfs.pem',
:glusterfs_volume_pattern => 'manila-share-volume-\d+$',
:backend_availability_zone => 'my_zone',
}
end

1
spec/defines/manila_backend_glusternfs_spec.rb
View File

@ -12,6 +12,7 @@ describe 'manila::backend::glusternfs' do
:glusterfs_nfs_server_type => 'gluster',
:glusterfs_path_to_private_key => '/etc/glusterfs/glusterfs.pem',
:glusterfs_ganesha_server_ip => '127.0.0.1',
:backend_availability_zone => 'my_zone',
}
end

1
spec/defines/manila_backend_hitachi_hnas_spec.rb
View File

@ -13,6 +13,7 @@ describe 'manila::backend::hitachi_hnas' do
:hitachi_hnas_evs_id => '1',
:hitachi_hnas_evs_ip => ' 172.24.53.1',
:hitachi_hnas_file_system_name => 'FS-Manila',
:backend_availability_zone => 'my_zone',
}
end

3
spec/defines/manila_backend_lvm_spec.rb
View File

@ -13,6 +13,7 @@ describe 'manila::backend::lvm' do
:lvm_share_mirrors => 1,
:lvm_share_volume_group => 'lvm-shares',
:lvm_share_helpers => ['CIFS=manila.share.drivers.helpers.CIFSHelperUserAccess','NFS=manila.share.drivers.helpers.NFSHelper'],
:backend_availability_zone => 'my_zone',
}
end
@ -27,6 +28,8 @@ describe 'manila::backend::lvm' do
is_expected.to contain_manila_config('mylvm/lvm_share_volume_group').with_value('lvm-shares')
is_expected.to contain_manila_config('mylvm/lvm_share_helpers').with_value(
'CIFS=manila.share.drivers.helpers.CIFSHelperUserAccess,NFS=manila.share.drivers.helpers.NFSHelper')
is_expected.to contain_manila_config('mylvm/backend_availability_zone').with_value(
'my_zone')
end
end

2
spec/defines/manila_backend_netapp_spec.rb
View File

@ -7,6 +7,7 @@ describe 'manila::backend::netapp' do
let :params do
{
:driver_handles_share_servers => true,
:backend_availability_zone => 'my_zone',
:netapp_login => 'netapp',
:netapp_password => 'password',
:netapp_server_hostname => '127.0.0.2',
@ -19,6 +20,7 @@ describe 'manila::backend::netapp' do
let :default_params do
{
:backend_availability_zone => '<SERVICE DEFAULT>',
:netapp_transport_type => 'http',
:netapp_storage_family => 'ontap_cluster',
:netapp_volume_name_template => 'share_%(share_id)s',