Add support for [DEFAULT] image_download_concurrency
Change-Id: I969e7e9d07c097d8c48015a2c4e116ce1d1daac2
This commit is contained in:
@@ -198,6 +198,11 @@
|
|||||||
# after the next heartbeat.
|
# after the next heartbeat.
|
||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
#
|
#
|
||||||
|
# [*image_download_concurrency*]
|
||||||
|
# (optional) How many image downloads and raw format conversion to run in
|
||||||
|
# parallel.
|
||||||
|
# Defaults to $::os_service_default
|
||||||
|
#
|
||||||
# DEPRECATED PARAMETERS
|
# DEPRECATED PARAMETERS
|
||||||
#
|
#
|
||||||
# [*api_url*]
|
# [*api_url*]
|
||||||
@@ -250,6 +255,7 @@ class ironic::conductor (
|
|||||||
$rescue_kernel = $::os_service_default,
|
$rescue_kernel = $::os_service_default,
|
||||||
$rescue_ramdisk = $::os_service_default,
|
$rescue_ramdisk = $::os_service_default,
|
||||||
$allow_provisioning_in_maintenance = $::os_service_default,
|
$allow_provisioning_in_maintenance = $::os_service_default,
|
||||||
|
$image_download_concurrency = $::os_service_default,
|
||||||
# DEPRECATED PARAMETERS
|
# DEPRECATED PARAMETERS
|
||||||
$api_url = undef,
|
$api_url = undef,
|
||||||
$configdrive_use_swift = undef,
|
$configdrive_use_swift = undef,
|
||||||
@@ -358,6 +364,7 @@ Use inspect_wait_timeout instead')
|
|||||||
'conductor/rescue_kernel': value => $rescue_kernel;
|
'conductor/rescue_kernel': value => $rescue_kernel;
|
||||||
'conductor/rescue_ramdisk': value => $rescue_ramdisk;
|
'conductor/rescue_ramdisk': value => $rescue_ramdisk;
|
||||||
'conductor/allow_provisioning_in_maintenance': value => $allow_provisioning_in_maintenance;
|
'conductor/allow_provisioning_in_maintenance': value => $allow_provisioning_in_maintenance;
|
||||||
|
'DEFAULT/image_download_concurrency': value => $image_download_concurrency;
|
||||||
}
|
}
|
||||||
|
|
||||||
if $cleaning_network_name {
|
if $cleaning_network_name {
|
||||||
|
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
The new ``image_download_concurrency`` parameter has been added
|
||||||
|
to the ``ironic::conductor`` class.
|
@@ -83,6 +83,7 @@ describe 'ironic::conductor' do
|
|||||||
is_expected.to contain_ironic_config('conductor/power_state_sync_max_retries').with(:value => '<SERVICE DEFAULT>')
|
is_expected.to contain_ironic_config('conductor/power_state_sync_max_retries').with(:value => '<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_ironic_config('conductor/power_failure_recovery_interval').with(:value => '<SERVICE DEFAULT>')
|
is_expected.to contain_ironic_config('conductor/power_failure_recovery_interval').with(:value => '<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_ironic_config('conductor/conductor_group').with(:value => '<SERVICE DEFAULT>')
|
is_expected.to contain_ironic_config('conductor/conductor_group').with(:value => '<SERVICE DEFAULT>')
|
||||||
|
is_expected.to contain_ironic_config('DEFAULT/image_download_concurrency').with(:value => '<SERVICE DEFAULT>')
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when overriding parameters' do
|
context 'when overriding parameters' do
|
||||||
@@ -117,6 +118,7 @@ describe 'ironic::conductor' do
|
|||||||
:rescue_kernel => 'http://host/rescue.kernel',
|
:rescue_kernel => 'http://host/rescue.kernel',
|
||||||
:rescue_ramdisk => 'http://host/rescue.ramdisk',
|
:rescue_ramdisk => 'http://host/rescue.ramdisk',
|
||||||
:allow_provisioning_in_maintenance => false,
|
:allow_provisioning_in_maintenance => false,
|
||||||
|
:image_download_concurrency => 20,
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
it 'should replace default parameter with new value' do
|
it 'should replace default parameter with new value' do
|
||||||
@@ -150,6 +152,7 @@ describe 'ironic::conductor' do
|
|||||||
is_expected.to contain_ironic_config('conductor/rescue_kernel').with_value(p[:rescue_kernel])
|
is_expected.to contain_ironic_config('conductor/rescue_kernel').with_value(p[:rescue_kernel])
|
||||||
is_expected.to contain_ironic_config('conductor/rescue_ramdisk').with_value(p[:rescue_ramdisk])
|
is_expected.to contain_ironic_config('conductor/rescue_ramdisk').with_value(p[:rescue_ramdisk])
|
||||||
is_expected.to contain_ironic_config('conductor/allow_provisioning_in_maintenance').with_value(p[:allow_provisioning_in_maintenance])
|
is_expected.to contain_ironic_config('conductor/allow_provisioning_in_maintenance').with_value(p[:allow_provisioning_in_maintenance])
|
||||||
|
is_expected.to contain_ironic_config('DEFAULT/image_download_concurrency').with_value(p[:image_download_concurrency])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user