openstack
/
puppet-tripleo
Code Issues Proposed changes

Allow for customization of the Manila CephFS pool name 

Manila needs to know the CephFS pool name, which the deployer
might want to customize when the Ceph cluster is externally managed.

Change-Id: I3adaa442b8c53ff902761d1dba283a79494c8ae6
Partial-Bug: 1837099
(cherry picked from commit e3b39a8d67)
(cherry picked from commit 3c4748b462)
(cherry picked from commit fe10653c3f)
This commit is contained in:
Giulio Fidente 2019-07-18 20:12:18 +02:00 committed by Goutham Pacha Ravi
parent 40d594eb0b
commit d19ebc0511
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

@ -110,6 +110,7 @@ class tripleo::profile::base::manila::share (
$manila_cephfs_backend = hiera('manila::backend::cephfs::title') $manila_cephfs_backend = hiera('manila::backend::cephfs::title')
$cephfs_auth_id = hiera('manila::backend::cephfs::cephfs_auth_id') $cephfs_auth_id = hiera('manila::backend::cephfs::cephfs_auth_id')
$cephfs_ganesha_server_ip = hiera('manila::backend::cephfs::cephfs_ganesha_server_ip', undef) $cephfs_ganesha_server_ip = hiera('manila::backend::cephfs::cephfs_ganesha_server_ip', undef)
$manila_cephfs_pool_name = hiera('manila::backend::cephfs::pool_name', 'manila_data')
if $cephfs_ganesha_server_ip == undef { if $cephfs_ganesha_server_ip == undef {
$cephfs_ganesha_server_ip_real = hiera('ganesha_vip', undef) $cephfs_ganesha_server_ip_real = hiera('ganesha_vip', undef)
@ -135,7 +136,7 @@ class tripleo::profile::base::manila::share (
if $manila_cephfs_protocol_helper_type == 'NFS' { if $manila_cephfs_protocol_helper_type == 'NFS' {
manila_config { manila_config {
"${manila_cephfs_backend}/ganesha_rados_store_enable": value => true; "${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;
} }
} }
} else { } else {