stackforge/puppet-openstack-cloud
Code Issues Proposed changes

neutron: fix report_interval

Browse Source 
report_interval should be configure on all neutron agents.
This commit is contained in:
Emilien Macchi
2014-05-06 07:06:57 +02:00
parent fbb89154a1
commit 4b0e1cfcd1
9 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/network.pp
View File

@@ -101,6 +101,7 @@ class cloud::network(
service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'], service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'],
log_dir => $log_dir, log_dir => $log_dir,
dhcp_lease_duration => $dhcp_lease_duration, dhcp_lease_duration => $dhcp_lease_duration,
report_interval => '30',
} }
class { 'neutron::agents::ovs': class { 'neutron::agents::ovs':

1
manifests/network/controller.pp
View File

@@ -46,7 +46,6 @@ class cloud::network::controller(
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', agent_down_time => '60',
report_interval => '30',
} }
class { 'neutron::server::notifications': class { 'neutron::server::notifications':

3
spec/classes/cloud_compute_hypervisor_spec.rb
View File

@@ -138,7 +138,8 @@ describe 'cloud::compute::hypervisor' do
:bind_host => '10.0.0.1', :bind_host => '10.0.0.1',
:core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin', :core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin',
:service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'], :service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'],
:log_dir => false :log_dir => false,
:report_interval => '30'
) )
should contain_class('neutron::agents::ovs').with( should contain_class('neutron::agents::ovs').with(
:enable_tunneling => true, :enable_tunneling => true,

6
spec/classes/cloud_network_controller_spec.rb
View File

@@ -68,7 +68,8 @@ describe 'cloud::network::controller' do
:core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin', :core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin',
:service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'], :service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'],
:log_dir => false, :log_dir => false,
:dhcp_lease_duration => '10' :dhcp_lease_duration => '10',
:report_interval => '30'
) )
should contain_class('neutron::agents::ovs').with( should contain_class('neutron::agents::ovs').with(
:enable_tunneling => true, :enable_tunneling => true,
@@ -93,8 +94,7 @@ describe 'cloud::network::controller' do
: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', :agent_down_time => '60'
:report_interval => '30'
) )
end end

3
spec/classes/cloud_network_dhcp_spec.rb
View File

@@ -57,7 +57,8 @@ describe 'cloud::network::dhcp' do
:core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin', :core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin',
:service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'], :service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'],
:log_dir => false, :log_dir => false,
:dhcp_lease_duration => '10' :dhcp_lease_duration => '10',
:report_interval => '30'
) )
should contain_class('neutron::agents::ovs').with( should contain_class('neutron::agents::ovs').with(
:enable_tunneling => true, :enable_tunneling => true,

3
spec/classes/cloud_network_l3_spec.rb
View File

@@ -57,7 +57,8 @@ describe 'cloud::network::l3' do
:core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin', :core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin',
:service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'], :service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'],
:log_dir => false, :log_dir => false,
:dhcp_lease_duration => '10' :dhcp_lease_duration => '10',
:report_interval => '30'
) )
should contain_class('neutron::agents::ovs').with( should contain_class('neutron::agents::ovs').with(
:enable_tunneling => true, :enable_tunneling => true,

3
spec/classes/cloud_network_lbaas_spec.rb
View File

@@ -57,7 +57,8 @@ describe 'cloud::network::lbaas' do
:core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin', :core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin',
:service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'], :service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'],
:log_dir => false, :log_dir => false,
:dhcp_lease_duration => '10' :dhcp_lease_duration => '10',
:report_interval => '30'
) )
should contain_class('neutron::agents::ovs').with( should contain_class('neutron::agents::ovs').with(
:enable_tunneling => true, :enable_tunneling => true,

3
spec/classes/cloud_network_metadata_spec.rb
View File

@@ -64,7 +64,8 @@ describe 'cloud::network::metadata' do
:core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin', :core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin',
:service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'], :service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'],
:log_dir => false, :log_dir => false,
:dhcp_lease_duration => '10' :dhcp_lease_duration => '10',
:report_interval => '30'
) )
should contain_class('neutron::agents::ovs').with( should contain_class('neutron::agents::ovs').with(
:enable_tunneling => true, :enable_tunneling => true,

3
spec/classes/cloud_network_vpn_spec.rb
View File

@@ -52,7 +52,8 @@ describe 'cloud::network::vpn' do
:core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin', :core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin',
:service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'], :service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'],
:log_dir => false, :log_dir => false,
:dhcp_lease_duration => '10' :dhcp_lease_duration => '10',
:report_interval => '30'
) )
should contain_class('neutron::agents::ovs').with( should contain_class('neutron::agents::ovs').with(
:enable_tunneling => true, :enable_tunneling => true,