commit 973a52f816dd564e268bed41dde9f196c24a5b94
author Jenkins <jenkins@review.openstack.org> Mon Sep 16 16:02:50 2013 +0000
committer Gerrit Code Review <review@openstack.org> Mon Sep 16 16:02:50 2013 +0000
tree d9074baea4110ef783f14afa3515b80cecae19e7
parent f1212c9e7cb27c8f23eff724dc34a4dd51781acf
parent c76c058df21ae9fa0198dfcaad0c0ea4ead8e09f

Merge "Disable ceilometer.compute.nova_notifier driver"

lib/nova

diff --git a/lib/nova b/lib/nova
index 9b766a9..577c260 100644
--- a/lib/nova
+++ b/lib/nova
@@ -513,7 +513,6 @@
         iniset $NOVA_CONF DEFAULT instance_usage_audit "True"
         iniset $NOVA_CONF DEFAULT instance_usage_audit_period "hour"
         iniset $NOVA_CONF DEFAULT notify_on_state_change "vm_and_task_state"
-        iniset_multiline $NOVA_CONF DEFAULT notification_driver "nova.openstack.common.notifier.rpc_notifier" "ceilometer.compute.nova_notifier"
     fi
 
     # Provide some transition from ``EXTRA_FLAGS`` to ``EXTRA_OPTS``