diff --git a/deployment/puppet/openstack/manifests/ceilometer.pp b/deployment/puppet/openstack/manifests/ceilometer.pp
index 283ae43b78..70d73b1b16 100644
--- a/deployment/puppet/openstack/manifests/ceilometer.pp
+++ b/deployment/puppet/openstack/manifests/ceilometer.pp
@@ -29,7 +29,6 @@ class openstack::ceilometer (
   $on_compute          = false,
   $ha_mode             = false,
   $primary_controller  = false,
-  $use_neutron         = false,
   $ext_mongo           = false,
   # ttl is 1 week (3600*24*7)
   $time_to_live        = '604800',
@@ -121,10 +120,6 @@ class openstack::ceilometer (
       store_events => true,
     }
 
-    if $use_neutron {
-      neutron_config { 'DEFAULT/notification_driver': value => 'messaging' }
-    }
-
     if $ha_mode {
       include ceilometer_ha::agent::central
 
diff --git a/deployment/puppet/openstack/manifests/controller.pp b/deployment/puppet/openstack/manifests/controller.pp
index d37fedfe45..33b41fcefa 100644
--- a/deployment/puppet/openstack/manifests/controller.pp
+++ b/deployment/puppet/openstack/manifests/controller.pp
@@ -383,7 +383,6 @@ class openstack::controller (
       ha_mode              => $ha_mode,
       primary_controller   => $primary_controller,
       on_controller        => true,
-      use_neutron          => $network_provider ? {'nova' => false, 'neutron' => true},
       ext_mongo            => $ceilometer_ext_mongo,
       mongo_replicaset     => $mongo_replicaset,
     }
diff --git a/deployment/puppet/openstack/manifests/network.pp b/deployment/puppet/openstack/manifests/network.pp
index 4b5500ad17..5b0511ca73 100644
--- a/deployment/puppet/openstack/manifests/network.pp
+++ b/deployment/puppet/openstack/manifests/network.pp
@@ -66,6 +66,9 @@ class openstack::network (
   $region            = 'RegionOne',
   $neutron_url       = 'http://127.0.0.1:9696',
 
+  # Ceilometer notifications
+  $ceilometer = false,
+
   # Nova settings
   $private_interface,
   $public_interface,
@@ -224,6 +227,10 @@ class openstack::network (
         neutron_config { 'DEFAULT/use_syslog_rfc_format': value => true; }
       }
 
+      if $ceilometer {
+        neutron_config { 'DEFAULT/notification_driver': value => 'messaging' }
+      }
+
       if $agents {
         class {'openstack::network::neutron_agents':
           agents    => $agents,
diff --git a/deployment/puppet/osnailyfacter/modular/openstack-network/openstack-network-controller.pp b/deployment/puppet/osnailyfacter/modular/openstack-network/openstack-network-controller.pp
index c958f85003..3a6a679c49 100644
--- a/deployment/puppet/osnailyfacter/modular/openstack-network/openstack-network-controller.pp
+++ b/deployment/puppet/osnailyfacter/modular/openstack-network/openstack-network-controller.pp
@@ -11,6 +11,7 @@ $rabbit_hash                    = hiera('rabbit_hash', {})
 $internal_address               = hiera('internal_address')
 $service_endpoint               = hiera('management_vip')
 $nova_hash                      = hiera('nova', {})
+$ceilometer_hash                = hiera('ceilometer',{})
 
 $floating_hash = {}
 
@@ -218,6 +219,9 @@ class { 'openstack::network':
   auth_url        => "http://${service_endpoint}:35357/v2.0",
   neutron_url     => "http://${service_endpoint}:9696",
 
+  # Ceilometer notifications
+  ceilometer => $ceilometer_hash['enabled'],
+
   #metadata
   shared_secret   => $neutron_metadata_proxy_secret,
   metadata_ip     => $service_endpoint,