From ca070c246d496f806b095286e4a446398f6e1f01 Mon Sep 17 00:00:00 2001
From: Sandy Walsh <sandy.walsh@rackspace.com>
Date: Thu, 16 Jan 2014 17:01:03 +0000
Subject: [PATCH] fix config

---
 README.md      |  4 ++--
 docs/setup.rst | 25 +++++++++++++++++++++++--
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 3cfe97f..d246137 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ Finally, `DJANGO_SETTINGS_MODULE` tells Django where to get its configuration fr
 
 The `sample_stacktach_worker_config.json` file tells StackTach where each of the RabbitMQ servers are that it needs to get events from. In most cases you'll only have one entry in this file, but for large multi-cell deployments, this file can get pretty large. It's also handy for setting up one StackTach for each developer environment.
 
-The file is in json format and the main configuration is under the `"deployments"` key, which should contain a list of deployment dictionaries. 
+The file is in json format and the main configuration is under the `"deployments"` key, which should contain a list of deployment dictionaries.
 
 A blank worker config file would look like this:
 ```
@@ -74,7 +74,7 @@ where, *name* is whatever you want to call your deployment, and *rabbit_<>* are
 
 By default, Nova uses ephemeral queues. If you are using durable queues, be sure to change the necessary flag here.
 
-You can add as many deployments as you like. 
+You can add as many deployments as you like.
 
 #### Starting the Worker
 
diff --git a/docs/setup.rst b/docs/setup.rst
index 2ed5b44..0c53f2f 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -48,7 +48,13 @@ But that's not much fun. A deployment entry would look like this: ::
              "rabbit_port": 5672,
              "rabbit_userid": "rabbit",
              "rabbit_password": "rabbit",
-             "rabbit_virtual_host": "/"
+             "rabbit_virtual_host": "/",
+             "topics": {
+                 "nova": [
+                     {"queue": "notifications.info", "routing_key": "notifications.info"},
+                     {"queue": "notifications.error", "routing_key": "notifications.error"},
+                 ]
+             }
          }
     ]}
 
@@ -56,8 +62,12 @@ where, *name* is whatever you want to call your deployment, and *rabbit_\** are
 
 By default, Nova uses ephemeral queues. If you are using durable queues, be sure to change the necessary flag here.
 
+The topics section defines which queues to pull notifications from. You should
+pull notifications from all related queues (``.error``, ``.info``, ``.warn``, etc)
+
 You can add as many deployments as you like.
 
+
 Starting the Worker
 ===================
 
@@ -72,7 +82,7 @@ Configuring Nova to Generate Notifications
 In the OpenStack service you wish to have generate notifications, add the
 following to its ``.conf`` file: ::
 
-    --notification_driver=nova.openstack.common.notifier.rabbit_notifier
+    --notification_driver=nova.openstack.common.notifier.rpc_notifier
     --notification_topics=monitor
 
 **Note:** *This will likely change once the various project switch to ``oslo.messaging``
@@ -83,6 +93,17 @@ This will tell OpenStack to publish notifications to a Rabbit exchange starting
 
 You'll need to restart Nova once these changes are made.
 
+If you're using `DevStack`_ you may want to set up your ``local.conf`` to include the following: ::
+
+    [[post-config|$NOVA_CONF]]
+    [DEFAULT]
+    notification_driver=nova.openstack.common.notifier.rpc_notifier
+    notification_topics=notifications,monitor
+    notify_on_state_change=vm_and_task_state
+    notify_on_any_change=True
+    instance_usage_audit=True
+    instance_usage_audit_period=hour
+
 Next Steps
 ==========