openstack/puppet-cinder
Code Issues Proposed changes

Add nfs_qcow2_volumes option

Browse Source 
Add nfs_qcow2_volumes option to configure that create volumes as
QCOW2 files rather than raw files.

Change-Id: I968338fd8876395289028924e41d0acc1bba5e5e
Closes-Bug: #1740447
This commit is contained in:
ZhongShengping 2017-12-29 08:51:23 +08:00
parent ba1f77f159
commit f6fe6a0442
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/backend/nfs.pp
View File

@ -77,6 +77,10 @@
# Platforms using libvirt <1.2.7 will encounter issues with this feature. # Platforms using libvirt <1.2.7 will encounter issues with this feature.
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# [*nfs_qcow2_volumes*]
# (Optional) Create volumes as QCOW2 files rather than raw files.
# Defaults to $::os_service_default
#
# [*extra_options*] # [*extra_options*]
# (optional) Hash of extra options to pass to the backend stanza # (optional) Hash of extra options to pass to the backend stanza
# Defaults to: {} # Defaults to: {}
@ -97,6 +101,7 @@ define cinder::backend::nfs (
$nas_secure_file_operations = $::os_service_default, $nas_secure_file_operations = $::os_service_default,
$nas_secure_file_permissions = $::os_service_default, $nas_secure_file_permissions = $::os_service_default,
$nfs_snapshot_support = $::os_service_default, $nfs_snapshot_support = $::os_service_default,
$nfs_qcow2_volumes = $::os_service_default,
$manage_volume_type = false, $manage_volume_type = false,
$extra_options = {}, $extra_options = {},
) { ) {
@ -122,6 +127,7 @@ define cinder::backend::nfs (
"${name}/nfs_used_ratio": value => $nfs_used_ratio; "${name}/nfs_used_ratio": value => $nfs_used_ratio;
"${name}/nfs_oversub_ratio": value => $nfs_oversub_ratio; "${name}/nfs_oversub_ratio": value => $nfs_oversub_ratio;
"${name}/nfs_snapshot_support": value => $nfs_snapshot_support; "${name}/nfs_snapshot_support": value => $nfs_snapshot_support;
"${name}/nfs_qcow2_volumes": value => $nfs_qcow2_volumes;
"${name}/nas_secure_file_operations": value => "${name}/nas_secure_file_operations": value =>
$nas_secure_file_operations; $nas_secure_file_operations;
"${name}/nas_secure_file_permissions": value => "${name}/nas_secure_file_permissions": value =>

4
releasenotes/notes/add-nfs_qcow2_volumes-1398a245687e13fd.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- Add new parameter "nfs_qcow2_volumes" to configure that create
volumes as QCOW2 files rather than raw files.

3
spec/defines/cinder_backend_nfs_spec.rb
View File

@ -18,6 +18,7 @@ describe 'cinder::backend::nfs' do
:nas_secure_file_operations => 'auto', :nas_secure_file_operations => 'auto',
:nas_secure_file_permissions => 'false', :nas_secure_file_permissions => 'false',
:nfs_snapshot_support => 'true', :nfs_snapshot_support => 'true',
:nfs_qcow2_volumes => 'true',
} }
end end
@ -50,6 +51,8 @@ describe 'cinder::backend::nfs' do
'false') 'false')
is_expected.to contain_cinder_config('hippo/nfs_snapshot_support').with_value( is_expected.to contain_cinder_config('hippo/nfs_snapshot_support').with_value(
'true') 'true')
is_expected.to contain_cinder_config('hippo/nfs_qcow2_volumes').with_value(
'true')
is_expected.to contain_file('/etc/cinder/other_shares.conf').with( is_expected.to contain_file('/etc/cinder/other_shares.conf').with(
:content => "10.10.10.10:/shares\n10.10.10.10:/shares2", :content => "10.10.10.10:/shares\n10.10.10.10:/shares2",
:require => 'Anchor[cinder::install::end]', :require => 'Anchor[cinder::install::end]',