openstack/fuel-library
Code Issues Proposed changes

Merge "Lower number of workers for neutron-server workers"

Browse Source
This commit is contained in:
Jenkins 2016-04-14 10:27:22 +00:00 committed by Gerrit Code Review
commit 7278f2558a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/openstack_tasks/manifests/openstack_network/server_config.pp
View File

@ -87,7 +87,7 @@ class openstack_tasks::openstack_network::server_config {
$nova_url = "${nova_internal_protocol}://${nova_internal_endpoint}:8774/v2"
$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', { })
$l2_population = try_get_value($neutron_advanced_config, 'neutron_l2_pop', false)

2
tests/noop/spec/hosts/openstack-network/server-config_spec.rb
View File

@ -226,7 +226,7 @@ describe manifest do
end
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)
should contain_class('neutron::server').with(
'api_workers' => workers,