openstack
/
puppet-glance
Code Issues Proposed changes

cinder store: Support cinder_do_extend_attached 

This introduces support for the new cinder_do_extend_attached option
which was added in the 2023.1 release. See the dependent change to find
more details.

Depends-on: https://review.opendev.org/868742
Change-Id: I4fbb2d275cf261286390765d9cd98112ca8adf0c
This commit is contained in:
Takashi Kajinami 2023-03-14 12:31:07 +09:00
parent 192e6d0022
commit 9cb7a5ae66
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/backend/multistore/cinder.pp
View File

@ -86,8 +86,13 @@
# Defaults to $facts['os_service_default'].
#
# [*cinder_mount_point_base*]
# (Optional) When glance uses cinder as store and cinder backend is NFS, the mount point
# would be required to be set with this parameter.
# (Optional) When glance uses cinder as store and cinder backend is NFS,
# the mount point would be required to be set with this parameter.
# Defaults to $facts['os_service_default'].
#
# [*cinder_do_extend_attached*]
# (Optional) If this is set to True, glance will perform an extend operation
# on the attached volume.
# Defaults to $facts['os_service_default'].
#
# [*store_description*]
@ -112,6 +117,7 @@ define glance::backend::multistore::cinder(
$cinder_enforce_multipath = $facts['os_service_default'],
$cinder_use_multipath = $facts['os_service_default'],
$cinder_mount_point_base = $facts['os_service_default'],
$cinder_do_extend_attached = $facts['os_service_default'],
$store_description = $facts['os_service_default'],
) {
@ -134,6 +140,7 @@ define glance::backend::multistore::cinder(
"${name}/cinder_enforce_multipath": value => $cinder_enforce_multipath;
"${name}/cinder_use_multipath": value => $cinder_use_multipath;
"${name}/cinder_mount_point_base": value => $cinder_mount_point_base;
"${name}/cinder_do_extend_attached": value => $cinder_do_extend_attached;
"${name}/store_description": value => $store_description;
}
@ -153,6 +160,7 @@ define glance::backend::multistore::cinder(
"${name}/cinder_volume_type": value => $cinder_volume_type;
"${name}/cinder_enforce_multipath": value => $cinder_enforce_multipath;
"${name}/cinder_mount_point_base": value => $cinder_mount_point_base;
"${name}/cinder_do_extend_attached": value => $cinder_do_extend_attached;
"${name}/cinder_use_multipath": value => $cinder_use_multipath;
}
}

5
releasenotes/notes/cinder_do_extend_attached-020a2fcc09f314db.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
The ``glance::backend::multistore::cinder`` defined resource type now
supports the ``cinder_do_extend_attached`` option.

5
spec/defines/glance_backend_multistore_cinder_spec.rb
View File

@ -47,6 +47,7 @@ describe 'glance::backend::multistore::cinder' do
is_expected.to contain_glance_api_config('cinder/cinder_enforce_multipath').with_value('<SERVICE DEFAULT>')
is_expected.to contain_glance_api_config('cinder/cinder_use_multipath').with_value('<SERVICE DEFAULT>')
is_expected.to contain_glance_api_config('cinder/cinder_mount_point_base').with_value('<SERVICE DEFAULT>')
is_expected.to contain_glance_api_config('cinder/cinder_do_extend_attached').with_value('<SERVICE DEFAULT>')
end
it 'configures glance-cache.conf' do
is_expected.to_not contain_glance_cache_config('cinder/store_description')
@ -66,6 +67,7 @@ describe 'glance::backend::multistore::cinder' do
is_expected.to contain_glance_cache_config('cinder/cinder_enforce_multipath').with_value('<SERVICE DEFAULT>')
is_expected.to contain_glance_cache_config('cinder/cinder_use_multipath').with_value('<SERVICE DEFAULT>')
is_expected.to contain_glance_cache_config('cinder/cinder_mount_point_base').with_value('<SERVICE DEFAULT>')
is_expected.to contain_glance_cache_config('cinder/cinder_do_extend_attached').with_value('<SERVICE DEFAULT>')
end
end
@ -89,6 +91,7 @@ describe 'glance::backend::multistore::cinder' do
:cinder_enforce_multipath => true,
:cinder_use_multipath => true,
:cinder_mount_point_base => '/var/lib/glance/mnt',
:cinder_do_extend_attached => false,
}
end
it 'configures glance-api.conf' do
@ -109,6 +112,7 @@ describe 'glance::backend::multistore::cinder' do
is_expected.to contain_glance_api_config('cinder/cinder_enforce_multipath').with_value(true)
is_expected.to contain_glance_api_config('cinder/cinder_use_multipath').with_value(true)
is_expected.to contain_glance_api_config('cinder/cinder_mount_point_base').with_value('/var/lib/glance/mnt')
is_expected.to contain_glance_api_config('cinder/cinder_do_extend_attached').with_value(false)
end
it 'configures glance-cache.conf' do
is_expected.to_not contain_glance_cache_config('cinder/store_description')
@ -128,6 +132,7 @@ describe 'glance::backend::multistore::cinder' do
is_expected.to contain_glance_cache_config('cinder/cinder_enforce_multipath').with_value(true)
is_expected.to contain_glance_cache_config('cinder/cinder_use_multipath').with_value(true)
is_expected.to contain_glance_cache_config('cinder/cinder_mount_point_base').with_value('/var/lib/glance/mnt')
is_expected.to contain_glance_cache_config('cinder/cinder_do_extend_attached').with_value(false)
end
end
end