From 0b978000a821bfb745bfe7029f1af2c65c0b2082 Mon Sep 17 00:00:00 2001
From: Luka Peschke <luka.peschke@objectif-libre.com>
Date: Tue, 3 Apr 2018 14:17:19 +0200
Subject: [PATCH] Update Devstack documentation and README

CloudKitty's ceilometer collector and Gnocchi's devstack plugin do not exist
anymore, so the documentation has been updated accordingly.

Change-Id: Ief49cffae2a7c5a5a292eae5850ef10e21f275bb
---
 devstack/README.rst     | 46 ++++++++++++++++++++---------------------
 doc/source/devstack.rst | 27 ++----------------------
 2 files changed, 25 insertions(+), 48 deletions(-)

diff --git a/devstack/README.rst b/devstack/README.rst
index bfe9e533..20b733e0 100644
--- a/devstack/README.rst
+++ b/devstack/README.rst
@@ -2,39 +2,39 @@
 Installing CloudKitty using DevStack
 ====================================
 
-The ``devstack`` directory contains the files necessary to integrate CloudKitty with DevStack.
+The ``devstack`` directory contains the required files to integrate CloudKitty
+with DevStack.
 
 Configure DevStack to run CloudKitty
+====================================
 
     $ DEVSTACK_DIR=/path/to/devstack
 
-    1. enable Ceilometer::
+1. enable Ceilometer::
 
-        $ cd ${DEVSTACK_DIR}
-        $ cat >> local.conf << EOF
-        [[local|localrc]]
-        # ceilometer
-        enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer.git master
-        EOF
+   $ cd ${DEVSTACK_DIR}
+   $ cat >> local.conf << EOF
+   [[local|localrc]]
+   # ceilometer
+   enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer.git master
+   EOF
 
-    2. enable Gnocchi::
+2. enable CloudKitty::
 
-        $ cd ${DEVSTACK_DIR}
-        $ cat >> local.conf << EOF
-        # gnocchi
-        enable_plugin gnocchi https://github.com/gnocchixyz/gnocchi
-        enable_service gnocchi-api, gnocchi-metricd
-        EOF
+   $ cd ${DEVSTACK_DIR}
+   cat >> local.conf << EOF
+   # cloudkitty
+   enable_plugin cloudkitty https://git.openstack.org/openstack/cloudkitty master
+   enable_service ck-api, ck-proc
+   EOF
 
-    3. enable CloudKitty::
+3. Set CloudKitty collector to gnocchi::
 
-        $ cd ${DEVSTACK_DIR}
-        cat >> local.conf << EOF
-        # cloudkitty
-        enable_plugin cloudkitty https://git.openstack.org/openstack/cloudkitty master
-        enable_service ck-api, ck-proc
-        EOF
+   $ cd ${DEVSTACK_DIR}
+   cat >> local.conf << EOF
+   CLOUDKITTY_COLLECTOR=gnocchi
+   EOF
 
-Run devstack as normal::
+Run devstack as usual::
 
     $ ./stack.sh
diff --git a/doc/source/devstack.rst b/doc/source/devstack.rst
index c688b6aa..6725e710 100644
--- a/doc/source/devstack.rst
+++ b/doc/source/devstack.rst
@@ -3,40 +3,17 @@ DevStack installation
 #####################
 
 Add the following lines in your ``local.conf`` file to enable CloudKitty with
-the ceilometer collector:
-
-::
+gnocchi collector::
 
     [[local|localrc]]
     # ceilometer
     enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer.git master
 
-    # cloudkitty
-    enable_plugin cloudkitty https://git.openstack.org/openstack/cloudkitty.git master
-    enable_service ck-api,ck-proc
-    CLOUDKITTY_COLLECTOR=ceilometer
-
-
-To enable the gnocchi collector, use the following instead:
-
-::
-
-    [[local|localrc]]
-    # gnocchi
-    enable_plugin gnocchi https://github.com/gnocchixyz/gnocchi.git master
-    enable_service gnocchi-api,gnocchi-metricd
-
-    # ceilometer
-    enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer.git master
-
     # cloudkitty
     enable_plugin cloudkitty https://git.openstack.org/openstack/cloudkitty.git master
     enable_service ck-api,ck-proc
     CLOUDKITTY_COLLECTOR=gnocchi
 
-
-Then start devstack:
-
-::
+Then start devstack::
 
     ./stack.sh