openstack/puppet-cinder
Code Issues Proposed changes

Extend support for gpfs volume driver

Browse Source 
Allow using a different volume driver such as GPFSNFSDriver or
GPFSRemoteDriver. The options for the GPFSNFSDriver driver have been
supported but the driver could not be used previously.

Also add support for options used by GPFRemoteDriver.

Change-Id: Ib1b72291b2771db9a14a73797b1c3be6e1be1d47
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-09-04 12:22:49 +09:00
parent 706e74c726
commit 6df226460e
3 changed files with 74 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
manifests/backend/gpfs.pp
View File

@@ -8,6 +8,10 @@
# (required) Specifies the path of the GPFS directory where Block Storage
# volume and snapshot files are stored.
#
# [*volume_driver*]
# (Optional) Driver to use for volume creation
# Defaults to 'cinder.volume.drivers.ibm.gpfs.GPFSDriver'.
#
# [*volume_backend_name*]
# (optional) The name of the cinder::backend::gpfs resource
# Defaults to $name.
@@ -68,6 +72,34 @@
# (optional) SSH port to use to connect to NAS system.
# Defaults to $facts['os_service_default']
#
# [*gpfs_hosts*]
# (optional) List of IP addresses or hostnames of GPFS nodes.
# Defaults to $facts['os_service_default']
#
# [*gpfs_user_login*]
# (optional) Username for GPFS nodes.
# Defaults to $facts['os_service_default']
#
# [*gpfs_user_password*]
# (optional) Password for GPFS node user.
# Defaults to $facts['os_service_default']
#
# [*gpfs_private_key*]
# (optional) Filename of private key to use for SSH authentication.
# Defaults to $facts['os_service_default']
#
# [*gpfs_ssh_port*]
# (optional) SSH port to use.
# Defaults to $facts['os_service_default']
#
# [*gpfs_hosts_key_file*]
# (optional) File containing SSH host keys for the GPFS nodes.
# Defaults to $facts['os_service_default']
#
# [*gpfs_strict_host_key_policy*]
# (optional) Enable strict GPFS host key checking
# Defaults to $facts['os_service_default']
#
# [*backend_availability_zone*]
# (Optional) Availability zone for this volume backend.
# If not set, the storage_availability_zone option value
@@ -108,6 +140,7 @@
#
define cinder::backend::gpfs (
$gpfs_mount_point_base,
$volume_driver = 'cinder.volume.drivers.ibm.gpfs.GPFSDriver',
$volume_backend_name = $name,
$gpfs_images_dir = $facts['os_service_default'],
$gpfs_images_share_mode = $facts['os_service_default'],
@@ -119,6 +152,13 @@ define cinder::backend::gpfs (
$nas_password = $facts['os_service_default'],
$nas_private_key = $facts['os_service_default'],
$nas_ssh_port = $facts['os_service_default'],
$gpfs_hosts = $facts['os_service_default'],
$gpfs_user_login = $facts['os_service_default'],
$gpfs_user_password = $facts['os_service_default'],
$gpfs_private_key = $facts['os_service_default'],
$gpfs_ssh_port = $facts['os_service_default'],
$gpfs_hosts_key_file = $facts['os_service_default'],
$gpfs_strict_host_key_policy = $facts['os_service_default'],
$backend_availability_zone = $facts['os_service_default'],
$image_volume_cache_enabled = $facts['os_service_default'],
$image_volume_cache_max_size_gb = $facts['os_service_default'],
@@ -136,7 +176,7 @@ define cinder::backend::gpfs (
}
cinder_config {
"${name}/volume_driver": value => 'cinder.volume.drivers.ibm.gpfs.GPFSDriver';
"${name}/volume_driver": value => $volume_driver;
"${name}/volume_backend_name": value => $volume_backend_name;
"${name}/gpfs_max_clone_depth": value => $gpfs_max_clone_depth;
"${name}/gpfs_mount_point_base": value => $gpfs_mount_point_base;
@@ -149,6 +189,13 @@ define cinder::backend::gpfs (
"${name}/nas_password": value => $nas_password, secret => true;
"${name}/nas_private_key": value => $nas_private_key;
"${name}/nas_ssh_port": value => $nas_ssh_port;
"${name}/gpfs_hosts": value => join(any2array($gpfs_hosts), ',');
"${name}/gpfs_user_login": value => $gpfs_user_login;
"${name}/gpfs_user_password": value => $gpfs_user_password, secret => true;
"${name}/gpfs_private_key": value => $gpfs_private_key;
"${name}/gpfs_ssh_port": value => $gpfs_ssh_port;
"${name}/gpfs_hosts_key_file": value => $gpfs_hosts_key_file;
"${name}/gpfs_strict_host_key_policy": value => $gpfs_strict_host_key_policy;
"${name}/backend_availability_zone": value => $backend_availability_zone;
"${name}/image_volume_cache_enabled": value => $image_volume_cache_enabled;
"${name}/image_volume_cache_max_size_gb": value => $image_volume_cache_max_size_gb;

9
releasenotes/notes/gpfs-more-options-dbc8188d9779391f.yaml Normal file
View File

@@ -0,0 +1,9 @@
---
features:
- |
The ``cinder::backend::gpfs`` defined resource type now supports
the ``volume_driver`` parameter to use different volume drivers.
- |
The ``cinder::backend::gpfs`` defined resource type now supports
the options for GPFSRemoteDriver .

20
spec/defines/cinder_backend_gpfs_spec.rb
View File

@@ -11,6 +11,7 @@ describe 'cinder::backend::gpfs' do
let :default_params do
{
:volume_driver => 'cinder.volume.drivers.ibm.gpfs.GPFSDriver',
:backend_availability_zone => '<SERVICE DEFAULT>',
:image_volume_cache_enabled => '<SERVICE DEFAULT>',
:image_volume_cache_max_size_gb => '<SERVICE DEFAULT>',
@@ -25,11 +26,19 @@ describe 'cinder::backend::gpfs' do
:nas_password => '<SERVICE DEFAULT>',
:nas_private_key => '<SERVICE DEFAULT>',
:nas_ssh_port => '<SERVICE DEFAULT>',
:gpfs_hosts => '<SERVICE DEFAULT>',
:gpfs_user_login => '<SERVICE DEFAULT>',
:gpfs_user_password => '<SERVICE DEFAULT>',
:gpfs_private_key => '<SERVICE DEFAULT>',
:gpfs_ssh_port => '<SERVICE DEFAULT>',
:gpfs_hosts_key_file => '<SERVICE DEFAULT>',
:gpfs_strict_host_key_policy => '<SERVICE DEFAULT>',
}
end
let :custom_params do
{
:volume_driver => 'cinder.volume.drivers.ibm.gpfs.GPFSNFSDriver',
:backend_availability_zone => 'my_zone',
:image_volume_cache_enabled => true,
:image_volume_cache_max_size_gb => 100,
@@ -42,6 +51,13 @@ describe 'cinder::backend::gpfs' do
:nas_password => 'nas_password',
:nas_private_key => '/path/to/private_key',
:nas_ssh_port => '22',
:gpfs_hosts => 'localhost',
:gpfs_user_login => 'root',
:gpfs_user_password => 'rootpass',
:gpfs_private_key => '/path/to/private_key',
:gpfs_ssh_port => 22,
:gpfs_hosts_key_file => '/path/to/host_key',
:gpfs_strict_host_key_policy => false,
}
end
@@ -50,15 +66,13 @@ describe 'cinder::backend::gpfs' do
default_params.merge(params)
end
it { is_expected.to contain_cinder_config('gpfs/volume_driver').with_value(
'cinder.volume.drivers.ibm.gpfs.GPFSDriver'
)}
it { is_expected.to contain_cinder_config('gpfs/volume_backend_name').with_value('gpfs') }
it {
params_hash.each_pair do |config,value|
is_expected.to contain_cinder_config("gpfs/#{config}").with_value( value )
end
is_expected.to contain_cinder_config('gpfs/gpfs_user_password').with_secret(true)
}
end