diff --git a/deployment/puppet/openstack_tasks/manifests/openstack_network/server_config.pp b/deployment/puppet/openstack_tasks/manifests/openstack_network/server_config.pp index 584b76ea0b..414eedf832 100644 --- a/deployment/puppet/openstack_tasks/manifests/openstack_network/server_config.pp +++ b/deployment/puppet/openstack_tasks/manifests/openstack_network/server_config.pp @@ -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) diff --git a/tests/noop/spec/hosts/openstack-network/server-config_spec.rb b/tests/noop/spec/hosts/openstack-network/server-config_spec.rb index e0cce62994..7bc7f769a7 100644 --- a/tests/noop/spec/hosts/openstack-network/server-config_spec.rb +++ b/tests/noop/spec/hosts/openstack-network/server-config_spec.rb @@ -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,