diff --git a/README.md b/README.md index 7f5bbf9..c8f9928 100644 --- a/README.md +++ b/README.md @@ -83,6 +83,7 @@ Nova Networking Neutron Networking ---- +* `neutron["api_workers"]` - number of api worksers to start in wsgi. defaults to 0 * `neutron["network_api_class"]` - used in nova.conf.the neutron api driver class. * `neutron["auth_strategy"]` - used in nova.conf. the authentication strategy to use, by default this is set to keystone * `neutron["libvirt_vif_driver"]`- used in nova.conf. the virtual interface driver, by default nova.virt.libvirt.vif.LibvirtHybridOVSBridgeDriver diff --git a/attributes/default.rb b/attributes/default.rb index 784c89a..377d606 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -68,6 +68,7 @@ # Neutron Configuration Attributes # ######################################################################### # # nova.conf options for neutron +default["neutron"]["api_workers"] = 0 default["neutron"]["network_api_class"] = "nova.network.neutronv2.api.API" default["neutron"]["auth_strategy"] = "keystone" default["neutron"]["libvirt_vif_type"] = "ethernet" diff --git a/recipes/neutron-common.rb b/recipes/neutron-common.rb index b44c167..884e180 100644 --- a/recipes/neutron-common.rb +++ b/recipes/neutron-common.rb @@ -144,6 +144,7 @@ group "neutron" mode "0640" variables( + "api_workers" => node["neutron"]["api_workers"], "neutron_debug" => node["neutron"]["debug"], "neutron_verbose" => node["neutron"]["verbose"], "neutron_ipaddress" => api_endpoint["host"], diff --git a/templates/default/neutron.conf.erb b/templates/default/neutron.conf.erb index 7c7131f..1dc9610 100644 --- a/templates/default/neutron.conf.erb +++ b/templates/default/neutron.conf.erb @@ -13,6 +13,7 @@ ovs_use_veth = <%= @neutron_ovs_use_veth %> allow_overlapping_ips = <%= @overlapping_ips %> use_namespaces = <%= @neutron_namespace %> api_paste_config = /etc/neutron/api-paste.ini +api_workers = <%= @api_workers %> control_exchange = neutron rabbit_host = <%= @rabbit_ipaddress %> rabbit_ha_queues = <%= @rabbit_ha_queues %>