diff --git a/manifests/network.pp b/manifests/network.pp
index f4c5b381..9a3b83be 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -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':
diff --git a/manifests/network/controller.pp b/manifests/network/controller.pp
index 5ad76b36..5616f982 100644
--- a/manifests/network/controller.pp
+++ b/manifests/network/controller.pp
@@ -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':
diff --git a/spec/classes/cloud_compute_hypervisor_spec.rb b/spec/classes/cloud_compute_hypervisor_spec.rb
index 84801fe8..8f99c130 100644
--- a/spec/classes/cloud_compute_hypervisor_spec.rb
+++ b/spec/classes/cloud_compute_hypervisor_spec.rb
@@ -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,
diff --git a/spec/classes/cloud_network_controller_spec.rb b/spec/classes/cloud_network_controller_spec.rb
index 65dcf62a..ee232e4d 100644
--- a/spec/classes/cloud_network_controller_spec.rb
+++ b/spec/classes/cloud_network_controller_spec.rb
@@ -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
 
diff --git a/spec/classes/cloud_network_dhcp_spec.rb b/spec/classes/cloud_network_dhcp_spec.rb
index 5f863045..cfb8c5d6 100644
--- a/spec/classes/cloud_network_dhcp_spec.rb
+++ b/spec/classes/cloud_network_dhcp_spec.rb
@@ -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,
diff --git a/spec/classes/cloud_network_l3_spec.rb b/spec/classes/cloud_network_l3_spec.rb
index 69ea1270..998d89e6 100644
--- a/spec/classes/cloud_network_l3_spec.rb
+++ b/spec/classes/cloud_network_l3_spec.rb
@@ -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,
diff --git a/spec/classes/cloud_network_lbaas_spec.rb b/spec/classes/cloud_network_lbaas_spec.rb
index a83c5747..143e0047 100644
--- a/spec/classes/cloud_network_lbaas_spec.rb
+++ b/spec/classes/cloud_network_lbaas_spec.rb
@@ -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,
diff --git a/spec/classes/cloud_network_metadata_spec.rb b/spec/classes/cloud_network_metadata_spec.rb
index d090a2eb..5114597c 100644
--- a/spec/classes/cloud_network_metadata_spec.rb
+++ b/spec/classes/cloud_network_metadata_spec.rb
@@ -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,
diff --git a/spec/classes/cloud_network_vpn_spec.rb b/spec/classes/cloud_network_vpn_spec.rb
index cc3362ca..ca033a72 100644
--- a/spec/classes/cloud_network_vpn_spec.rb
+++ b/spec/classes/cloud_network_vpn_spec.rb
@@ -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,