Skip to content

Commit

Permalink
Make api_workers configurable
Browse files Browse the repository at this point in the history
- Add api_workers attribute and neutron.conf template variable

Issue rcbops/chef-cookbooks#935

(cherry picked from commit c67e4e7)
  • Loading branch information
claco committed May 27, 2014
1 parent b059b93 commit 2125ad5
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 0 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions attributes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions recipes/neutron-common.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down
1 change: 1 addition & 0 deletions templates/default/neutron.conf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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 %>
Expand Down

0 comments on commit 2125ad5

Please sign in to comment.