neutron: fix report_interval
report_interval should be configure on all neutron agents.
This commit is contained in:
		@@ -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'],
 | 
			
		||||
    log_dir                 => $log_dir,
 | 
			
		||||
    dhcp_lease_duration     => $dhcp_lease_duration,
 | 
			
		||||
    report_interval         => '30',
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  class { 'neutron::agents::ovs':
 | 
			
		||||
 
 | 
			
		||||
@@ -46,7 +46,6 @@ class cloud::network::controller(
 | 
			
		||||
    database_connection => "mysql://${encoded_user}:${encoded_password}@${neutron_db_host}/neutron?charset=utf8",
 | 
			
		||||
    api_workers         => $::processorcount,
 | 
			
		||||
    agent_down_time     => '60',
 | 
			
		||||
    report_interval     => '30',
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  class { 'neutron::server::notifications':
 | 
			
		||||
 
 | 
			
		||||
@@ -138,7 +138,8 @@ describe 'cloud::compute::hypervisor' do
 | 
			
		||||
          :bind_host               => '10.0.0.1',
 | 
			
		||||
          :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'],
 | 
			
		||||
          :log_dir                 => false
 | 
			
		||||
          :log_dir                 => false,
 | 
			
		||||
          :report_interval         => '30'
 | 
			
		||||
      )
 | 
			
		||||
      should contain_class('neutron::agents::ovs').with(
 | 
			
		||||
          :enable_tunneling => true,
 | 
			
		||||
 
 | 
			
		||||
@@ -68,7 +68,8 @@ describe 'cloud::network::controller' do
 | 
			
		||||
          :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'],
 | 
			
		||||
          :log_dir                 => false,
 | 
			
		||||
          :dhcp_lease_duration     => '10'
 | 
			
		||||
          :dhcp_lease_duration     => '10',
 | 
			
		||||
          :report_interval         => '30'
 | 
			
		||||
      )
 | 
			
		||||
      should contain_class('neutron::agents::ovs').with(
 | 
			
		||||
          :enable_tunneling => true,
 | 
			
		||||
@@ -93,8 +94,7 @@ describe 'cloud::network::controller' do
 | 
			
		||||
          :auth_port           => '5000',
 | 
			
		||||
          :database_connection => 'mysql://neutron:secrete@10.0.0.1/neutron?charset=utf8',
 | 
			
		||||
          :api_workers         => '2',
 | 
			
		||||
          :agent_down_time     => '60',
 | 
			
		||||
          :report_interval     => '30'
 | 
			
		||||
          :agent_down_time     => '60'
 | 
			
		||||
        )
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -57,7 +57,8 @@ describe 'cloud::network::dhcp' do
 | 
			
		||||
          :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'],
 | 
			
		||||
          :log_dir                 => false,
 | 
			
		||||
          :dhcp_lease_duration     => '10'
 | 
			
		||||
          :dhcp_lease_duration     => '10',
 | 
			
		||||
          :report_interval         => '30'
 | 
			
		||||
      )
 | 
			
		||||
      should contain_class('neutron::agents::ovs').with(
 | 
			
		||||
          :enable_tunneling => true,
 | 
			
		||||
 
 | 
			
		||||
@@ -57,7 +57,8 @@ describe 'cloud::network::l3' do
 | 
			
		||||
          :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'],
 | 
			
		||||
          :log_dir                 => false,
 | 
			
		||||
          :dhcp_lease_duration     => '10'
 | 
			
		||||
          :dhcp_lease_duration     => '10',
 | 
			
		||||
          :report_interval         => '30'
 | 
			
		||||
      )
 | 
			
		||||
      should contain_class('neutron::agents::ovs').with(
 | 
			
		||||
          :enable_tunneling => true,
 | 
			
		||||
 
 | 
			
		||||
@@ -57,7 +57,8 @@ describe 'cloud::network::lbaas' do
 | 
			
		||||
          :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'],
 | 
			
		||||
          :log_dir                 => false,
 | 
			
		||||
          :dhcp_lease_duration     => '10'
 | 
			
		||||
          :dhcp_lease_duration     => '10',
 | 
			
		||||
          :report_interval         => '30'
 | 
			
		||||
      )
 | 
			
		||||
      should contain_class('neutron::agents::ovs').with(
 | 
			
		||||
          :enable_tunneling => true,
 | 
			
		||||
 
 | 
			
		||||
@@ -64,7 +64,8 @@ describe 'cloud::network::metadata' do
 | 
			
		||||
          :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'],
 | 
			
		||||
          :log_dir                 => false,
 | 
			
		||||
          :dhcp_lease_duration     => '10'
 | 
			
		||||
          :dhcp_lease_duration     => '10',
 | 
			
		||||
          :report_interval         => '30'
 | 
			
		||||
      )
 | 
			
		||||
      should contain_class('neutron::agents::ovs').with(
 | 
			
		||||
          :enable_tunneling => true,
 | 
			
		||||
 
 | 
			
		||||
@@ -52,7 +52,8 @@ describe 'cloud::network::vpn' do
 | 
			
		||||
          :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'],
 | 
			
		||||
          :log_dir                 => false,
 | 
			
		||||
          :dhcp_lease_duration     => '10'
 | 
			
		||||
          :dhcp_lease_duration     => '10',
 | 
			
		||||
          :report_interval         => '30'
 | 
			
		||||
      )
 | 
			
		||||
      should contain_class('neutron::agents::ovs').with(
 | 
			
		||||
          :enable_tunneling => true,
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user