openstack/fuel-library
Code Issues Proposed changes

Merge "Fixed default parameters for Nova and Neutron"

Browse Source
This commit is contained in:
Jenkins 2014-07-02 14:52:08 +00:00 committed by Gerrit Code Review
commit 8d0cb4a8a6
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/neutron/manifests/server.pp
View File

@ -76,6 +76,8 @@ class neutron::server (
'DEFAULT/nova_admin_password': value => $neutron_config['server']['notify_nova_admin_password'];
'DEFAULT/nova_admin_auth_url': value => $neutron_config['server']['notify_nova_admin_auth_url'];
'DEFAULT/send_events_interval': value => $neutron_config['server']['notify_nova_send_events_interval'];
'DEFAULT/api_workers': value => min($::processorcount + 0, 50 + 0);
'DEFAULT/rpc_workers': value => min($::processorcount + 0, 50 + 0);
'database/connection': value => $neutron_config['database']['url'];
'database/max_retries': value => $neutron_config['database']['reconnects'];
'database/reconnect_interval': value => $neutron_config['database']['reconnect_interval'];

2
deployment/puppet/nova/manifests/api.pp
View File

@ -27,7 +27,7 @@ class nova::api(
$nova_quota_driver = 'nova.quota.NoopQuotaDriver',
$nova_rate_limits = undef,
$nova_user_password= undef, #Empty password generates error and saves from non-working installation
$api_workers = $::processorcount,
$api_workers = min($::processorcount + 0, 50 + 0),
) {
include nova::params

2
deployment/puppet/openstack/manifests/controller.pp
View File

@ -198,7 +198,7 @@ class openstack::controller (
$nameservers = undef,
#
$max_retries = '-1',
$max_pool_size = '10',
$max_pool_size = '50',
$max_overflow = '30',
$idle_timeout = '3600',
) {