summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorMark McClain <mark.mcclain@dreamhost.com>2013-07-02 21:09:02 -0400
committerMark McClain <mark.mcclain@dreamhost.com>2013-07-02 22:14:39 -0400
commitef17d89e0869973c25aa027430fbe446bba55e4b (patch)
treee7363aedf196520d05705e28302e08c2fe3bd28d /tools
parent8a7dc3ea3640af46f275c7e3569b1004c4c43a8e (diff)
downloadceilometer-ef17d89e0869973c25aa027430fbe446bba55e4b.tar.gz
update Quantum references to Neutron
implements bug 1197208 Change-Id: I5b9467a0534a0842b0262efa79f316178780f0bd
Diffstat (limited to 'tools')
-rwxr-xr-xtools/enable_notifications.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/enable_notifications.sh b/tools/enable_notifications.sh
index 38967ede..c9564ab6 100755
--- a/tools/enable_notifications.sh
+++ b/tools/enable_notifications.sh
@@ -21,12 +21,20 @@ then
echo "notification_driver=cinder.openstack.common.notifier.rabbit_notifier" >> $CINDER_CONF
fi
+# For compatibility with Grizzly
QUANTUM_CONF=/etc/quantum/quantum.conf
if ! grep -q "notification_driver=quantum.openstack.common.notifier.rabbit_notifier" $QUANTUM_CONF
then
echo "notification_driver=quantum.openstack.common.notifier.rabbit_notifier" >> $QUANTUM_CONF
fi
+# Havana release onward
+NEUTRON_CONF=/etc/neutron/neutron.conf
+if ! grep -q "notification_driver=neutron.openstack.common.notifier.rabbit_notifier" $NEUTRON_CONF
+then
+ echo "notification_driver=neutron.openstack.common.notifier.rabbit_notifier" >> $NEUTRON_CONF
+fi
+
# For nova we set both the rabbit notifier and the special ceilometer
# notifier that forces one more poll to happen before an instance is
# removed.