Add missing block_device_allocate_* params in nova.conf
Support for 2 new parameters in [DEFAULT] section of nova.conf: - block_device_allocate_retries - block_device_allocate_retries_interval Change-Id: I6d52b0dbfe49eb29e5e68ecb38a855e01cf610df
This commit is contained in:
parent
d6d1e9020c
commit
1ce00db066
|
@ -396,6 +396,15 @@
|
|||
# in the nova config.
|
||||
# Defaults to false.
|
||||
#
|
||||
# [*block_device_allocate_retries*]
|
||||
# (optional) Number of times to retry block device allocation on failures
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*block_device_allocate_retries_interval*]
|
||||
# (optional) Waiting time interval (seconds) between block device allocation
|
||||
# retries on failures
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# DEPRECATED PARAMETERS
|
||||
#
|
||||
# [*verbose*]
|
||||
|
@ -408,6 +417,8 @@ class nova(
|
|||
$slave_connection = undef,
|
||||
$api_database_connection = undef,
|
||||
$api_slave_connection = undef,
|
||||
$block_device_allocate_retries = $::os_service_default,
|
||||
$block_device_allocate_retries_interval = $::os_service_default,
|
||||
$database_idle_timeout = undef,
|
||||
$database_min_pool_size = undef,
|
||||
$database_max_pool_size = undef,
|
||||
|
@ -702,6 +713,8 @@ class nova(
|
|||
'DEFAULT/rootwrap_config': value => $rootwrap_config;
|
||||
'DEFAULT/report_interval': value => $report_interval;
|
||||
'DEFAULT/use_ipv6': value => $use_ipv6;
|
||||
'DEFAULT/block_device_allocate_retries': value => $block_device_allocate_retries;
|
||||
'DEFAULT/block_device_allocate_retries_interval': value => $block_device_allocate_retries_interval;
|
||||
}
|
||||
|
||||
oslo::concurrency { 'nova_config': lock_path => $lock_path }
|
||||
|
|
|
@ -65,6 +65,10 @@ describe 'nova' do
|
|||
is_expected.to contain_nova_config('cinder/catalog_info').with('value' => 'volumev2:cinderv2:publicURL')
|
||||
end
|
||||
|
||||
it 'configures block_device_allocate params' do
|
||||
is_expected.to contain_nova_config('DEFAULT/block_device_allocate_retries').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_nova_config('DEFAULT/block_device_allocate_retries_interval').with_value('<SERVICE DEFAULT>')
|
||||
end
|
||||
end
|
||||
|
||||
context 'with overridden parameters' do
|
||||
|
@ -105,7 +109,10 @@ describe 'nova' do
|
|||
:upgrade_level_intercell => '1.0.0',
|
||||
:upgrade_level_network => '1.0.0',
|
||||
:upgrade_level_scheduler => '1.0.0',
|
||||
:purge_config => false, }
|
||||
:purge_config => false,
|
||||
:block_device_allocate_retries => '60',
|
||||
:block_device_allocate_retries_interval => '3',
|
||||
}
|
||||
end
|
||||
|
||||
it 'installs packages' do
|
||||
|
@ -183,6 +190,10 @@ describe 'nova' do
|
|||
) }
|
||||
end
|
||||
|
||||
it 'configures block_device_allocate params' do
|
||||
is_expected.to contain_nova_config('DEFAULT/block_device_allocate_retries').with_value('60')
|
||||
is_expected.to contain_nova_config('DEFAULT/block_device_allocate_retries_interval').with_value('3')
|
||||
end
|
||||
end
|
||||
|
||||
context 'with wrong notify_on_state_change parameter' do
|
||||
|
|
Loading…
Reference in New Issue