openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Allow for customization of the Manila CephFS pool name"

This commit is contained in:
Zuul 2019-07-31 22:51:30 +00:00 committed by Gerrit Code Review
parent 9133971c59 e3b39a8d67
commit 5f0a05c052
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/profile/base/manila/share.pp
View File

@ -105,6 +105,7 @@ class tripleo::profile::base::manila::share (
$cephfs_auth_id = hiera('manila::backend::cephfs::cephfs_auth_id')
$cephfs_ganesha_server_ip = hiera('manila::backend::cephfs::cephfs_ganesha_server_ip', undef)
$manila_cephfs_protocol_helper_type = hiera('manila::backend::cephfs::cephfs_protocol_helper_type', false)
$manila_cephfs_pool_name = hiera('manila::backend::cephfs::pool_name', 'manila_data')
if $cephfs_ganesha_server_ip == undef {
$cephfs_ganesha_server_ip_real = hiera('ganesha_vip', undef)
@ -134,7 +135,7 @@ class tripleo::profile::base::manila::share (
if $manila_cephfs_protocol_helper_type == 'NFS' {
manila_config {
"${manila_cephfs_backend}/ganesha_rados_store_enable": value => true;
"${manila_cephfs_backend}/ganesha_rados_store_pool_name": value => 'manila_data';
"${manila_cephfs_backend}/ganesha_rados_store_pool_name": value => $manila_cephfs_pool_name;
}
}