diff --git a/manifests/os_brick.pp b/manifests/os_brick.pp index 22ef0752..846a1216 100644 --- a/manifests/os_brick.pp +++ b/manifests/os_brick.pp @@ -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 cinder::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 { 'cinder_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, } } diff --git a/releasenotes/notes/os-brick-wait_mpath_device-bff9501f0e5225d6.yaml b/releasenotes/notes/os-brick-wait_mpath_device-bff9501f0e5225d6.yaml new file mode 100644 index 00000000..7905a35b --- /dev/null +++ b/releasenotes/notes/os-brick-wait_mpath_device-bff9501f0e5225d6.yaml @@ -0,0 +1,8 @@ +--- +features: + - | + The following parameters have been added to the ``cinder::os_brick`` + class. + + - ``wait_mpath_device_attempts`` + - ``wait_mpath_device_interval`` diff --git a/spec/classes/cinder_os_brick_spec.rb b/spec/classes/cinder_os_brick_spec.rb index ac170733..d8135b3b 100644 --- a/spec/classes/cinder_os_brick_spec.rb +++ b/spec/classes/cinder_os_brick_spec.rb @@ -7,7 +7,9 @@ describe 'cinder::os_brick' do context 'with defaults' do it 'configures the default values' do is_expected.to contain_oslo__os_brick('cinder_config').with( - :lock_path => '', + :lock_path => '', + :wait_mpath_device_attempts => '', + :wait_mpath_device_interval => '', ) end end @@ -15,13 +17,17 @@ describe 'cinder::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('cinder_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