Merge "Support new os-brick options"
This commit is contained in:
commit
ce9aa7cae7
@ -8,11 +8,24 @@
|
|||||||
# (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 nova::os_brick(
|
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':
|
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
|
context 'with defaults' do
|
||||||
it 'configures the default values' do
|
it 'configures the default values' do
|
||||||
is_expected.to contain_oslo__os_brick('nova_config').with(
|
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
|
||||||
end
|
end
|
||||||
@ -15,13 +17,17 @@ describe 'nova::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('nova_config').with(
|
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
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user