openstack/puppet-glance
Code Issues Proposed changes

Support new os-brick options

Browse Source 
Add support for the new options added in os-brick 6.9.0 .

Note:
Release note is omitted because the os_brick class was added during
this cycle.

Depends-on: https://review.opendev.org/930364
Change-Id: Ifac1c6479fd43c33452a35cbeeba8ee8b72a884d
This commit is contained in:
Takashi Kajinami
2024-09-25 02:19:31 +09:00
parent 8c04f753a8
commit cf14507e93
2 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
manifests/os_brick.pp
View File

@@ -8,14 +8,29 @@
# (Optional) Directory to use for os-brick lock files. # (Optional) Directory to use for os-brick lock files.
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
# [*wait_mpath_device_attempts*]
# (Optional) Number of attempts for the multipath device to be ready for I/O
# after it was created.
# Defaults to $facts['os_service_default']
#
# [*wait_mpath_device_interval*]
# (Optional) Interval value to wait for multipath device to be ready for I/O.
# Defaults to $facts['os_service_default']
#
class glance::os_brick( class glance::os_brick(
$lock_path = $facts['os_service_default'], $lock_path = $facts['os_service_default'],
$wait_mpath_device_attempts = $facts['os_service_default'],
$wait_mpath_device_interval = $facts['os_service_default'],
) { ) {
oslo::os_brick { 'glance_api_config': oslo::os_brick { 'glance_api_config':
lock_path => $lock_path lock_path => $lock_path,
wait_mpath_device_attempts => $wait_mpath_device_attempts,
wait_mpath_device_interval => $wait_mpath_device_interval,
} }
oslo::os_brick { 'glance_cache_config': oslo::os_brick { 'glance_cache_config':
lock_path => $lock_path lock_path => $lock_path,
wait_mpath_device_attempts => $wait_mpath_device_attempts,
wait_mpath_device_interval => $wait_mpath_device_interval,
} }
} }

20
spec/classes/glance_os_brick_spec.rb
View File

@@ -7,10 +7,14 @@ describe 'glance::os_brick' do
context 'with defaults' do context 'with defaults' do
it 'configures the default values' do it 'configures the default values' do
is_expected.to contain_oslo__os_brick('glance_api_config').with( is_expected.to contain_oslo__os_brick('glance_api_config').with(
:lock_path => '<SERVICE DEFAULT>', :lock_path => '<SERVICE DEFAULT>',
:wait_mpath_device_attempts => '<SERVICE DEFAULT>',
:wait_mpath_device_interval => '<SERVICE DEFAULT>',
) )
is_expected.to contain_oslo__os_brick('glance_cache_config').with( is_expected.to contain_oslo__os_brick('glance_cache_config').with(
:lock_path => '<SERVICE DEFAULT>', :lock_path => '<SERVICE DEFAULT>',
:wait_mpath_device_attempts => '<SERVICE DEFAULT>',
:wait_mpath_device_interval => '<SERVICE DEFAULT>',
) )
end end
end end
@@ -18,16 +22,22 @@ describe 'glance::os_brick' do
context 'with parameters overridden' do context 'with parameters overridden' do
let :params do let :params do
{ {
:lock_path => '/var/lib/openstack/lock' :lock_path => '/var/lib/openstack/lock',
:wait_mpath_device_attempts => 4,
:wait_mpath_device_interval => 1,
} }
end end
it 'configures the overridden values' do it 'configures the overridden values' do
is_expected.to contain_oslo__os_brick('glance_api_config').with( is_expected.to contain_oslo__os_brick('glance_api_config').with(
:lock_path => '/var/lib/openstack/lock', :lock_path => '/var/lib/openstack/lock',
:wait_mpath_device_attempts => 4,
:wait_mpath_device_interval => 1,
) )
is_expected.to contain_oslo__os_brick('glance_cache_config').with( is_expected.to contain_oslo__os_brick('glance_cache_config').with(
:lock_path => '/var/lib/openstack/lock', :lock_path => '/var/lib/openstack/lock',
:wait_mpath_device_attempts => 4,
:wait_mpath_device_interval => 1,
) )
end end
end end