Use 'notifications' as default notification queue name

All OpenStack projects uses `notifications' as topic by default, except
Glance, let's fix that.

This fixes bug #1083648

Change-Id: I973164f35a9466eb543656546d3110c6430170ef
Signed-off-by: Julien Danjou <julien@danjou.info>

doc/source/configuring.rst

@@ -782,7 +782,7 @@ Exchange name to use for connection when using ``rabbit`` strategy.
 
 * ``rabbit_notification_topic``
 
-Optional. Default: ``glance_notifications``
+Optional. Default: ``notifications``
 
 Topic to use for connection when using ``rabbit`` strategy.
 
@@ -825,10 +825,10 @@ Optional. Default: ``glanice_notifications``
 
 This is the topic prefix for notifications when using the ``qpid``
 notification strategy. When a notification is sent at the ``info`` priority,
-the topic will be ``glance_notifications.info``. The same idea applies for
+the topic will be ``notifications.info``. The same idea applies for
 the ``error`` and ``warn`` notification priorities. To receive all
 notifications, you would set up a receiver with a topic of
-``glance_notifications.*``.
+``notifications.*``.
 
 * ``qpid_host``
 

etc/glance-api.conf

@@ -154,13 +154,13 @@ rabbit_userid = guest
 rabbit_password = guest
 rabbit_virtual_host = /
 rabbit_notification_exchange = glance
-rabbit_notification_topic = glance_notifications
+rabbit_notification_topic = notifications
 rabbit_durable_queues = False
 
 # Configuration options if sending notifications via Qpid (these are
 # the defaults)
 qpid_notification_exchange = glance
-qpid_notification_topic = glance_notifications
+qpid_notification_topic = notifications
 qpid_host = localhost
 qpid_port = 5672
 qpid_username =

glance/notifier/notify_kombu.py

@@ -35,7 +35,7 @@ rabbit_opts = [
     cfg.StrOpt('rabbit_virtual_host', default='/'),
     cfg.StrOpt('rabbit_notification_exchange', default='glance'),
     cfg.StrOpt('rabbit_notification_topic',
-               default='glance_notifications'),
+               default='notifications'),
     cfg.StrOpt('rabbit_max_retries', default=0),
     cfg.StrOpt('rabbit_retry_backoff', default=2),
     cfg.StrOpt('rabbit_retry_max_backoff', default=30),

glance/notifier/notify_qpid.py

@@ -29,7 +29,7 @@ qpid_opts = [
                default='glance',
                help='Qpid exchange for notifications'),
     cfg.StrOpt('qpid_notification_topic',
-               default='glance_notifications',
+               default='notifications',
                help='Qpid topic for notifications'),
     cfg.StrOpt('qpid_hostname',
                default='localhost',

glance/tests/unit/test_notifier.py

@@ -350,7 +350,7 @@ class TestQpidNotifier(utils.BaseTestCase):
         self.mock_connection.open()
         self.mock_connection.session().AndReturn(self.mock_session)
         for p in ["info", "warn", "error"]:
-            expected_address = ('glance/glance_notifications.%s ; '
+            expected_address = ('glance/notifications.%s ; '
                                 '{"node": {"x-declare": {"auto-delete": true, '
                                 '"durable": false}, "type": "topic"}, '
                                 '"create": "always"}' % p)