Merge "Lower number of workers for neutron-server workers"
This commit is contained in:
commit
7278f2558a
@ -87,7 +87,7 @@ class openstack_tasks::openstack_network::server_config {
|
|||||||
$nova_url = "${nova_internal_protocol}://${nova_internal_endpoint}:8774/v2"
|
$nova_url = "${nova_internal_protocol}://${nova_internal_endpoint}:8774/v2"
|
||||||
|
|
||||||
$workers_max = hiera('workers_max', 16)
|
$workers_max = hiera('workers_max', 16)
|
||||||
$service_workers = pick($neutron_config['workers'], min(max($::processorcount, 2), $workers_max))
|
$service_workers = pick($neutron_config['workers'], min(max($::processorcount, 1), $workers_max))
|
||||||
|
|
||||||
$neutron_advanced_config = hiera_hash('neutron_advanced_configuration', { })
|
$neutron_advanced_config = hiera_hash('neutron_advanced_configuration', { })
|
||||||
$l2_population = try_get_value($neutron_advanced_config, 'neutron_l2_pop', false)
|
$l2_population = try_get_value($neutron_advanced_config, 'neutron_l2_pop', false)
|
||||||
|
@ -226,7 +226,7 @@ describe manifest do
|
|||||||
end
|
end
|
||||||
|
|
||||||
it 'worker count' do
|
it 'worker count' do
|
||||||
fallback_workers = [[facts[:processorcount].to_i, 2].max, workers_max.to_i].min
|
fallback_workers = [[facts[:processorcount].to_i, 1].max, workers_max.to_i].min
|
||||||
workers = neutron_config.fetch('workers', fallback_workers)
|
workers = neutron_config.fetch('workers', fallback_workers)
|
||||||
should contain_class('neutron::server').with(
|
should contain_class('neutron::server').with(
|
||||||
'api_workers' => workers,
|
'api_workers' => workers,
|
||||||
|
Loading…
Reference in New Issue
Block a user