Merge "Add parameters necessary to use a remote Ganesha service"
This commit is contained in:
commit
8b13fe2dce
|
@ -33,6 +33,26 @@
|
||||||
# (optional) IP of a server where Ganesha service runs on.
|
# (optional) IP of a server where Ganesha service runs on.
|
||||||
# Defaults to: undef
|
# Defaults to: undef
|
||||||
#
|
#
|
||||||
|
# [*cephfs_ganesha_server_is_remote*]
|
||||||
|
# (required) Whether the Ganesha service is remote or colocated on the
|
||||||
|
# same node where the Share service runs.
|
||||||
|
# Defaults to $::os_service_default
|
||||||
|
#
|
||||||
|
# [*cephfs_ganesha_server_username*]
|
||||||
|
# (optional) The username to use when logging on the remote node
|
||||||
|
# hosting the Ganesha service
|
||||||
|
# Defaults to: undef
|
||||||
|
#
|
||||||
|
# [*cephfs_ganesha_server_password*]
|
||||||
|
# (optional) The password to use when logging on the remote node
|
||||||
|
# hosting the Ganesha service
|
||||||
|
# Defaults to: undef
|
||||||
|
#
|
||||||
|
# [*cephfs_ganesha_path_to_private_key*]
|
||||||
|
# (optional) The secret key to use when logging on the remote node
|
||||||
|
# hosting the Ganesha service (preveals on server_password)
|
||||||
|
# Defaults to: undef
|
||||||
|
#
|
||||||
# [*cephfs_volume_mode*]
|
# [*cephfs_volume_mode*]
|
||||||
# (optional) octal rwx permissions for CephFS backing volumes,
|
# (optional) octal rwx permissions for CephFS backing volumes,
|
||||||
# snapshots, and groups of volumes and snapshots.
|
# snapshots, and groups of volumes and snapshots.
|
||||||
|
@ -50,6 +70,10 @@ define manila::backend::cephfs (
|
||||||
$cephfs_cluster_name = 'ceph',
|
$cephfs_cluster_name = 'ceph',
|
||||||
$cephfs_enable_snapshots = false,
|
$cephfs_enable_snapshots = false,
|
||||||
$cephfs_ganesha_server_ip = undef,
|
$cephfs_ganesha_server_ip = undef,
|
||||||
|
$cephfs_ganesha_server_is_remote = $::os_service_default,
|
||||||
|
$cephfs_ganesha_server_username = undef,
|
||||||
|
$cephfs_ganesha_server_password = undef,
|
||||||
|
$cephfs_ganesha_path_to_private_key = undef,
|
||||||
$cephfs_volume_mode = $::os_service_default,
|
$cephfs_volume_mode = $::os_service_default,
|
||||||
$cephfs_protocol_helper_type = 'CEPHFS',
|
$cephfs_protocol_helper_type = 'CEPHFS',
|
||||||
) {
|
) {
|
||||||
|
@ -67,6 +91,10 @@ define manila::backend::cephfs (
|
||||||
"${name}/cephfs_cluster_name": value => $cephfs_cluster_name;
|
"${name}/cephfs_cluster_name": value => $cephfs_cluster_name;
|
||||||
"${name}/cephfs_enable_snapshots": value => $cephfs_enable_snapshots;
|
"${name}/cephfs_enable_snapshots": value => $cephfs_enable_snapshots;
|
||||||
"${name}/cephfs_ganesha_server_ip": value => $cephfs_ganesha_server_ip;
|
"${name}/cephfs_ganesha_server_ip": value => $cephfs_ganesha_server_ip;
|
||||||
|
"${name}/cephfs_ganesha_server_is_remote": value => $cephfs_ganesha_server_is_remote;
|
||||||
|
"${name}/cephfs_ganesha_server_username": value => $cephfs_ganesha_server_username;
|
||||||
|
"${name}/cephfs_ganesha_server_password": value => $cephfs_ganesha_server_password;
|
||||||
|
"${name}/cephfs_ganesha_path_to_private_key": value => $cephfs_ganesha_path_to_private_key;
|
||||||
"${name}/cephfs_volume_mode": value => $cephfs_volume_mode;
|
"${name}/cephfs_volume_mode": value => $cephfs_volume_mode;
|
||||||
"${name}/cephfs_protocol_helper_type": value => $cephfs_protocol_helper_type;
|
"${name}/cephfs_protocol_helper_type": value => $cephfs_protocol_helper_type;
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,7 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
New parameters are added to the cephfs backend to permit
|
||||||
|
configuration with an external Ganesha service; the new
|
||||||
|
parameters define if Ganesha is remote and what are the
|
||||||
|
username/password or private key to log on the remote host.
|
|
@ -14,6 +14,9 @@ describe 'manila::backend::cephfs' do
|
||||||
:cephfs_enable_snapshots => true,
|
:cephfs_enable_snapshots => true,
|
||||||
:cephfs_protocol_helper_type => 'NFS',
|
:cephfs_protocol_helper_type => 'NFS',
|
||||||
:cephfs_ganesha_server_ip => '10.0.0.1',
|
:cephfs_ganesha_server_ip => '10.0.0.1',
|
||||||
|
:cephfs_ganesha_server_is_remote => true,
|
||||||
|
:cephfs_ganesha_server_username => 'ganeshadmin',
|
||||||
|
:cephfs_ganesha_path_to_private_key => '/readable/by/manila.key',
|
||||||
:cephfs_volume_mode => '0775'
|
:cephfs_volume_mode => '0775'
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
@ -36,7 +39,13 @@ describe 'manila::backend::cephfs' do
|
||||||
is_expected.to contain_manila_config('cephfs/cephfs_ganesha_server_ip').with_value(
|
is_expected.to contain_manila_config('cephfs/cephfs_ganesha_server_ip').with_value(
|
||||||
'10.0.0.1')
|
'10.0.0.1')
|
||||||
is_expected.to contain_manila_config('cephfs/cephfs_volume_mode').with_value(
|
is_expected.to contain_manila_config('cephfs/cephfs_volume_mode').with_value(
|
||||||
'0775'
|
'0775')
|
||||||
|
is_expected.to contain_manila_config('cephfs/cephfs_ganesha_server_is_remote').with_value(
|
||||||
|
true)
|
||||||
|
is_expected.to contain_manila_config('cephfs/cephfs_ganesha_server_username').with_value(
|
||||||
|
'ganeshadmin')
|
||||||
|
is_expected.to contain_manila_config('cephfs/cephfs_ganesha_path_to_private_key').with_value(
|
||||||
|
'/readable/by/manila.key'
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue