From 23d672ed126eec2b32ba320171dac27b1cde8cdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= <fguillot@internap.com>
Date: Tue, 6 Dec 2016 13:25:32 -0500
Subject: [PATCH] Configure Cinder and Nova automatically in devstack

Change-Id: Icdc5b30911d2fcb39716aaa871cbbc0eef84641b
---
 devstack/plugin.sh   | 11 +++++++++++
 doc/source/index.rst | 16 ++++------------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 05580c4..deb8e6e 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -41,6 +41,16 @@ function almanach_configure {
     iniset $ALMANACH_CONF database connection_url mongodb://localhost/almanach
 }
 
+function almanach_configure_external_services {
+    if is_service_enabled nova; then
+        iniset $NOVA_CONF DEFAULT notification_topics "almanach,notifications"
+    fi
+
+    if is_service_enabled cinder; then
+        iniset $CINDER_CONF DEFAULT notification_topics "almanach,notifications"
+    fi
+}
+
 # Create almanach related accounts in Keystone
 function almanach_create_accounts {
     OLD_OS_CLOUD=$OS_CLOUD
@@ -89,6 +99,7 @@ if is_service_enabled almanach-api almanach-collector; then
     elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
         echo_summary "Configuring Almanach"
         almanach_configure
+        almanach_configure_external_services
         almanach_create_accounts
     elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
         echo_summary "Initializing Almanach"
diff --git a/doc/source/index.rst b/doc/source/index.rst
index acd2238..3516d13 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -76,7 +76,7 @@ Protocol
 The authentication mechanism use the HTTP header :code:`X-Auth-Token` to send a token.
 This token is validated through Keystone or with the config file (private secret key).
 
-::
+:: code:: raw
 
     GET /volume_types HTTP/1.1
     X-Auth-Token: secret
@@ -93,7 +93,7 @@ Private Key Authentication
 The private secret key authentication is the default method.
 In your config file, you have to define your private key in the field :code:`auth_token`:
 
-::
+:: code:: raw
 
     [auth]
     strategy = private_key
@@ -106,7 +106,7 @@ Keystone Authentication
 The token will be validated with Keystone.
 To use this authentication backend you have to define the authentication strategy to :code:`keystone`.
 
-::
+:: code:: raw
 
     [auth]
     strategy = keystone
@@ -123,7 +123,7 @@ Each OpenStack services (Nova, Cinder, Neutron) need to be configured to send no
 
 For example with Nova, add the topic "almanach" in the config file :code:`/etc/nova.conf`:
 
-.. code:: bash
+.. code:: raw
 
     notification_topics=almanach
 
@@ -153,14 +153,6 @@ Devstack configuration
 
     enable_plugin almanach https://git.openstack.org/openstack/almanach
 
-    [[post-config|$NOVA_CONF]]
-    [DEFAULT]
-    notification_topics=almanach,notifications
-
-    [[post-config|$CINDER_CONF]]
-    [DEFAULT]
-    notification_topics=almanach,notifications
-
 
 Database entities
 -----------------