stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #370 from enovance/feature/369/emilien

Browse Source 
network/neutron: increase agent polling interval
This commit is contained in:
Sebastien Badia
2014-03-20 16:26:32 +01:00
parent 9c8c1bd2f6 112ede2ab4
commit f37d42c87f
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/network.pp
View File

@@ -121,7 +121,7 @@ class cloud::network(
neutron_plugin_ml2 { neutron_plugin_ml2 {
'agent/tunnel_types': value => ['gre']; 'agent/tunnel_types': value => ['gre'];
'agent/l2_population': value => true; 'agent/l2_population': value => true;
'agent/polling_interval': value => '2'; 'agent/polling_interval': value => '15';
'OVS/local_ip': value => $tunnel_eth; 'OVS/local_ip': value => $tunnel_eth;
'OVS/enable_tunneling': value => true; 'OVS/enable_tunneling': value => true;
'OVS/integration_bridge': value => 'br-int'; 'OVS/integration_bridge': value => 'br-int';

2
manifests/network/controller.pp
View File

@@ -40,6 +40,8 @@ class cloud::network::controller(
auth_port => $ks_keystone_public_port, auth_port => $ks_keystone_public_port,
database_connection => "mysql://${encoded_user}:${encoded_password}@${neutron_db_host}/neutron?charset=utf8", database_connection => "mysql://${encoded_user}:${encoded_password}@${neutron_db_host}/neutron?charset=utf8",
api_workers => $::processorcount, api_workers => $::processorcount,
agent_down_time => '60',
report_interval => '30',
} }
# Note(EmilienM): # Note(EmilienM):

4
spec/classes/cloud_network_controller_spec.rb
View File

@@ -86,7 +86,9 @@ describe 'cloud::network::controller' do
:auth_host => '10.0.0.1', :auth_host => '10.0.0.1',
:auth_port => '5000', :auth_port => '5000',
:database_connection => 'mysql://neutron:secrete@10.0.0.1/neutron?charset=utf8', :database_connection => 'mysql://neutron:secrete@10.0.0.1/neutron?charset=utf8',
:api_workers => '2' :api_workers => '2',
:agent_down_time => '60',
:report_interval => '30'
) )
end end