openstack
/
puppet-tripleo
Code Issues Proposed changes

Handle cinder_mount_point_base for cinder mounting needs 

Adding cinder_mount_point_base parameter, to provide the
mount point for *fs volumes.

Depends-On: Ib724f6e895716847827be48ed08b01a7a312338f
Change-Id: I3f9004fd8abffefe8cfeee9011ed0e323652fdd1
(cherry picked from commit a2dbbaedab)
(cherry picked from commit 1234d16497)
This commit is contained in:
PranaliD 2021-02-02 09:29:26 -05:00 committed by Pranali Deore
parent 4dd47c5c1d
commit e97541284a
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/profile/base/glance/backend/cinder.pp
View File

@ -69,6 +69,10 @@
# (Optional) Set to True when multipathd is enabled # (Optional) Set to True when multipathd is enabled
# Defaults to hiera('glance::backend::cinder::cinder_use_multipath', undef) # Defaults to hiera('glance::backend::cinder::cinder_use_multipath', undef)
# #
# [*cinder_mount_point_base*]
# (Optional) Directory where the NFS volume is mounted on the glance node.
# Defaults to hiera('glance::backend::cinder::cinder_mount_point_base', undef)
#
# [*store_description*] # [*store_description*]
# (Optional) Provides constructive information about the store backend to # (Optional) Provides constructive information about the store backend to
# end users. # end users.
@ -93,6 +97,7 @@ class tripleo::profile::base::glance::backend::cinder (
$cinder_store_password = hiera('glance::backend::cinder::cinder_store_password', undef), $cinder_store_password = hiera('glance::backend::cinder::cinder_store_password', undef),
$cinder_enforce_multipath = hiera('glance::backend::cinder::cinder_enforce_multipath', undef), $cinder_enforce_multipath = hiera('glance::backend::cinder::cinder_enforce_multipath', undef),
$cinder_use_multipath = hiera('glance::backend::cinder::cinder_use_multipath', undef), $cinder_use_multipath = hiera('glance::backend::cinder::cinder_use_multipath', undef),
$cinder_mount_point_base = hiera('glance::backend::cinder::cinder_mount_point_base', undef),
$store_description = hiera('tripleo::profile::base::glance::api::glance_store_description', 'Cinder store'), $store_description = hiera('tripleo::profile::base::glance::api::glance_store_description', 'Cinder store'),
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
) { ) {
@ -119,6 +124,7 @@ class tripleo::profile::base::glance::backend::cinder (
cinder_store_password => $cinder_store_password, cinder_store_password => $cinder_store_password,
cinder_enforce_multipath => $cinder_enforce_multipath, cinder_enforce_multipath => $cinder_enforce_multipath,
cinder_use_multipath => $cinder_use_multipath, cinder_use_multipath => $cinder_use_multipath,
cinder_mount_point_base => $cinder_mount_point_base,
store_description => $store_description_real, store_description => $store_description_real,
} }
} }

2
spec/classes/tripleo_profile_base_glance_backend_cinder_spec.rb
View File

@ -49,6 +49,7 @@ describe 'tripleo::profile::base::glance::backend::cinder' do
:cinder_store_password => 'glance_password', :cinder_store_password => 'glance_password',
:cinder_enforce_multipath => true, :cinder_enforce_multipath => true,
:cinder_use_multipath => true, :cinder_use_multipath => true,
:cinder_mount_point_base => '/var/lib/glance/mnt/nfs',
:step => 4, :step => 4,
} } } }
@ -65,6 +66,7 @@ describe 'tripleo::profile::base::glance::backend::cinder' do
:cinder_store_password => 'glance_password', :cinder_store_password => 'glance_password',
:cinder_enforce_multipath => true, :cinder_enforce_multipath => true,
:cinder_use_multipath => true, :cinder_use_multipath => true,
:cinder_mount_point_base => '/var/lib/glance/mnt/nfs',
:store_description => 'Cinder store', :store_description => 'Cinder store',
) )
end end