Merge "Add rpc options"

CHANGELOG.md

@@ -5,6 +5,7 @@ This file is used to list changes made in each version of cookbook-openstack-net
 * Upgrade to Icehouse
 * The balancer recipe now includes openstack-network::common
 * Neutron agents now subscribe to changes in neutron.conf
+* Add rpc attributes
 
 ## 8.5.1
 ### Bug

attributes/default.rb

@@ -179,6 +179,11 @@ default['openstack']['network']['dhcp_lease_duration'] = 86400
 # Driver or drivers to handle sending notifications
 default['openstack']['network']['notification_driver'] = 'neutron.openstack.common.notifier.rpc_notifier'
 
+# Common rpc definitions
+default['openstack']['network']['rpc_thread_pool_size'] = 64
+default['openstack']['network']['rpc_conn_pool_size'] = 30
+default['openstack']['network']['rpc_response_timeout'] = 60
+
 # ============================= DHCP Agent Configuration ===================
 
 # The scheduler class to use for scheduling to DHCP agents

spec/server_spec.rb

@@ -54,7 +54,6 @@ describe 'openstack-network::server' do
         expect(chef_run).not_to install_package 'neutron-plugin-openvswitch-agent'
         expect(chef_run).not_to enable_service 'neutron-plugin-openvswitch-agent'
       end
-
     end
 
     describe 'api-paste.ini' do
@@ -88,6 +87,21 @@ describe 'openstack-network::server' do
         )
       end
 
+      it 'it sets rpc_thread_pool_size correctly' do
+        expect(chef_run).to render_file(file.name).with_content(
+          'rpc_thread_pool_size = 64')
+      end
+
+      it 'it sets rpc_conn_pool_size correctly' do
+        expect(chef_run).to render_file(file.name).with_content(
+          'rpc_conn_pool_size = 30')
+      end
+
+      it 'it sets rpc_response_timeout correctly' do
+        expect(chef_run).to render_file(file.name).with_content(
+          'rpc_response_timeout = 60')
+      end
+
       it 'it sets agent_down_time correctly' do
         expect(chef_run).to render_file(file.name).with_content(
           'agent_down_time = 75')

templates/default/neutron.conf.erb

@@ -101,11 +101,11 @@ dhcp_lease_duration = <%= node["openstack"]["network"]["dhcp_lease_duration"] %>
 # The messaging module to use, defaults to kombu.
 # rpc_backend = neutron.openstack.common.rpc.impl_kombu
 # Size of RPC thread pool
-# rpc_thread_pool_size = 64,
+rpc_thread_pool_size = <%= node['openstack']['network']['rpc_thread_pool_size'] -%>
 # Size of RPC connection pool
-# rpc_conn_pool_size = 30
+rpc_conn_pool_size = <%= node['openstack']['network']['rpc_conn_pool_size'] -%>
 # Seconds to wait for a response from call or multicall
-# rpc_response_timeout = 60
+rpc_response_timeout = <%= node['openstack']['network']['rpc_response_timeout'] -%>
 # Seconds to wait before a cast expires (TTL). Only supported by impl_zmq.
 # rpc_cast_timeout = 30
 # Modules of exceptions that are permitted to be recreated