Add attribute for api_workers and rpc_workers

Change-Id: I758a4ca1c5551a2bb13cdf6e7da9ab62e23a5663
Closes-Bug: #1365005

CHANGELOG.md

@@ -5,8 +5,8 @@ This file is used to list changes made in each version of cookbook-openstack-net
 * Add support for Neutron VPN Service
 * Remove Neutron DB stamp and upgrade to head.
 * Add attribute for ML2 enable_ipset
-
 * Bump Chef gem to 11.16
+* Add attributes for api_workers and rpc_workers
 
 ## 10.0.1
 * Add tunnel_types item in ovs_neutron_plugin.ini.erb

attributes/default.rb

@@ -51,6 +51,18 @@ default['openstack']['network']['service_tenant_name'] = 'service'
 default['openstack']['network']['service_user'] = 'neutron'
 default['openstack']['network']['service_role'] = 'admin'
 
+# Number of separate worker processes to spawn.  The default, 0, runs the
+# worker thread in the current process.  Greater than 0 launches that number of
+# child processes as workers.  The parent process manages them.
+default['openstack']['network']['api_workers'] = 0
+
+# Number of separate RPC worker processes to spawn.  The default, 0, runs the
+# worker thread in the current process.  Greater than 0 launches that number of
+# child processes as RPC workers.  The parent process manages them.
+# This feature is experimental until issues are addressed and testing has been
+# enabled for various plugins for compatibility.
+default['openstack']['network']['rpc_workers'] = 0
+
 # The maximum number of seconds we will wait for an agent to checkin
 default['openstack']['network']['api']['agent']['agent_down_time'] = 75
 

spec/common_spec.rb

@@ -68,7 +68,7 @@ describe 'openstack-network::common' do
         %w(debug verbose state_path lock_path log_dir auth_strategy
            dhcp_lease_duration rpc_thread_pool_size rpc_conn_pool_size
            rpc_response_timeout control_exchange allow_overlapping_ips
-           notification_driver).each do |attr|
+           notification_driver api_workers rpc_workers).each do |attr|
           it "sets the #{attr} common attribute" do
             node.set['openstack']['network'][attr] = "#{attr}_value"
             expect(chef_run).to render_file(file.name).with_content(/^#{attr} = #{attr}_value$/)

templates/default/neutron.conf.erb

@@ -286,14 +286,14 @@ router_scheduler_driver = <%= node["openstack"]["network"]["l3"]["scheduler"] %>
 # Number of separate worker processes to spawn.  The default, 0, runs the
 # worker thread in the current process.  Greater than 0 launches that number of
 # child processes as workers.  The parent process manages them.
-# api_workers = 0
+api_workers = <%= node["openstack"]["network"]["api_workers"] %>
 
 # Number of separate RPC worker processes to spawn.  The default, 0, runs the
 # worker thread in the current process.  Greater than 0 launches that number of
 # child processes as RPC workers.  The parent process manages them.
 # This feature is experimental until issues are addressed and testing has been
 # enabled for various plugins for compatibility.
-# rpc_workers = 0
+rpc_workers = <%= node["openstack"]["network"]["rpc_workers"] %>
 
 # Sets the value of TCP_KEEPIDLE in seconds to use for each server socket when
 # starting API server. Not supported on OS X.