diff --git a/deployment/puppet/glance/manifests/api.pp b/deployment/puppet/glance/manifests/api.pp
index 4e80bdbcb4..14a2e0e74f 100644
--- a/deployment/puppet/glance/manifests/api.pp
+++ b/deployment/puppet/glance/manifests/api.pp
@@ -89,7 +89,6 @@ class glance::api(
   $clean_minute         = 0,
   $clean_ensure         = 'present',
   $image_cache_max_size = '10737418240',
-  $notify_mech          = 'noop',
   ) inherits glance {
 
   # used to configure concat
@@ -126,15 +125,6 @@ class glance::api(
     fail("Invalid db connection ${sql_connection}")
   }
 
-  if $notify_mech == 'noop'
-  {
-    glance_api_config { 'DEFAULT/notifier_strategy': value => 'noop'; }
-  }
-  else
-  {
-    include "glance::notify::${notify_mech}"
-  }
-
   # Logging
   if $log_file {
     glance_api_config {
diff --git a/deployment/puppet/glance/manifests/notify/qpid.pp b/deployment/puppet/glance/manifests/notify/qpid.pp
index f5a5d3ca93..becf28c850 100644
--- a/deployment/puppet/glance/manifests/notify/qpid.pp
+++ b/deployment/puppet/glance/manifests/notify/qpid.pp
@@ -9,11 +9,12 @@ class glance::notify::qpid(
 ) inherits glance::api {
 
   glance_api_config {
-    'DEFAULT/notifier_strategy': value => 'qpid';
-    'DEFAULT/qpid_host':         value => $qpid_host;
-    'DEFAULT/qpid_port':         value => $qpid_port;
-    'DEFAULT/qpid_username':     value => $qpid_username;
-    'DEFAULT/qpid_password':     value => $qpid_password;
+    'DEFAULT/notifier_strategy':   value => 'qpid';
+    'DEFAULT/notification_driver': value => 'messaging';
+    'DEFAULT/qpid_host':           value => $qpid_host;
+    'DEFAULT/qpid_port':           value => $qpid_port;
+    'DEFAULT/qpid_username':       value => $qpid_username;
+    'DEFAULT/qpid_password':       value => $qpid_password;
   }
 
 }
diff --git a/deployment/puppet/glance/manifests/notify/rabbitmq.pp b/deployment/puppet/glance/manifests/notify/rabbitmq.pp
index 627fae937c..91042b77b6 100644
--- a/deployment/puppet/glance/manifests/notify/rabbitmq.pp
+++ b/deployment/puppet/glance/manifests/notify/rabbitmq.pp
@@ -43,6 +43,7 @@ class glance::notify::rabbitmq(
 
   glance_api_config {
     'DEFAULT/notification_driver':          value => 'messaging';
+    'DEFAULT/notifier_strategy':            value => 'rabbit';
     'DEFAULT/rabbit_virtual_host':          value => $rabbit_virtual_host;
     'DEFAULT/rabbit_password':              value => $rabbit_password;
     'DEFAULT/rabbit_userid':                value => $rabbit_userid;