aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-06 20:31:50 +0000
committerGerrit Code Review <review@openstack.org>2016-09-06 20:31:50 +0000
commit4afb5806e376baedb65014a2a1fea66e8216beb8 (patch)
tree8a4e27b1d41b4985fce698d10a9e8bfacc02daba /puppet
parent8a573a919fa849d5dafe2ee800ed2255c6931594 (diff)
parent959e87238877fa03707ac624429e673f14ca0c2a (diff)
Merge "Change NeutronWorkers default to result in previous behavior"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/neutron-api.yaml14
1 files changed, 11 insertions, 3 deletions
diff --git a/puppet/services/neutron-api.yaml b/puppet/services/neutron-api.yaml
index da4ec26b..72ae7d9c 100644
--- a/puppet/services/neutron-api.yaml
+++ b/puppet/services/neutron-api.yaml
@@ -19,9 +19,16 @@ parameters:
via parameter_defaults in the resource registry.
type: json
NeutronWorkers:
- default: 0
- description: Number of workers for Neutron service.
- type: number
+ default: ''
+ description: |
+ Sets the number of API and RPC workers for the Neutron service. The
+ default value results in the configuration being left unset and a
+ system-dependent default will be chosen (usually the number of
+ processors). Please note that this can result in a large number of
+ processes and memory consumption on systems with a large core count. On
+ such systems it is recommended that a non-default value be selected that
+ matches the load requirements.
+ type: string
NeutronPassword:
description: The password for the neutron service and db account, used by neutron agents.
type: string
@@ -86,6 +93,7 @@ outputs:
neutron::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
neutron::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
neutron::server::api_workers: {get_param: NeutronWorkers}
+ neutron::server::rpc_workers: {get_param: NeutronWorkers}
neutron::server::allow_automatic_l3agent_failover: {get_param: NeutronAllowL3AgentFailover}
neutron::server::l3_ha: {get_param: NeutronL3HA}
neutron::keystone::authtoken::password: {get_param: NeutronPassword}