Support new os-brick options
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: I4784f3c3f2870996d28d1b16261efc451c4a757e
This commit is contained in:
parent
5218e2ff86
commit
de7b3a6aa3
@ -8,11 +8,24 @@
|
||||
# (Optional) Directory to use for os-brick lock files.
|
||||
# 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 nova::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 { 'nova_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,
|
||||
}
|
||||
}
|
||||
|
@ -7,7 +7,9 @@ describe 'nova::os_brick' do
|
||||
context 'with defaults' do
|
||||
it 'configures the default values' do
|
||||
is_expected.to contain_oslo__os_brick('nova_config').with(
|
||||
:lock_path => '<SERVICE DEFAULT>',
|
||||
:lock_path => '<SERVICE DEFAULT>',
|
||||
:wait_mpath_device_attempts => '<SERVICE DEFAULT>',
|
||||
:wait_mpath_device_interval => '<SERVICE DEFAULT>',
|
||||
)
|
||||
end
|
||||
end
|
||||
@ -15,13 +17,17 @@ describe 'nova::os_brick' do
|
||||
context 'with parameters overridden' 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
|
||||
|
||||
it 'configures the overridden values' do
|
||||
is_expected.to contain_oslo__os_brick('nova_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
|
||||
|
Loading…
Reference in New Issue
Block a user