Merge "Use oslo.config-sphinxext to build the conf options"

doc/source/conf.py

@@ -48,6 +48,7 @@ extensions = [
     'sphinxcontrib.pecanwsme.rest',
     'stevedore.sphinxext',
     'oslo_config.sphinxconfiggen',
+    'oslo_config.sphinxext',
     'sphinxcontrib.httpdomain',
 ]
 

doc/source/configuration/aodh-config-file.rst

@@ -0,0 +1,18 @@
+.. _aodh-config-file:
+
+Aodh Sample Configuration File
+==============================
+
+Configure Aodh by editing /etc/aodh/aodh.conf.
+
+No config file is provided with the source code, it will be created during
+the installation. In case where no configuration file was installed, one
+can be easily created by running::
+
+    aodh-config-generator
+
+The following is a sample Aodh configuration for adaptation and use. It is
+auto-generated from Aodh when this documentation is built, and can also be
+viewed in `file form <_static/aodh.conf.sample>`_.
+
+.. literalinclude:: ../_static/aodh.conf.sample

doc/source/configuration/aodh-config-options.rst

@@ -0,0 +1,7 @@
+Aodh Configuration Options
+==========================
+
+.. show-options::
+   :split-namespaces:
+
+   aodh

doc/source/configuration/index.rst

@@ -1,22 +1,12 @@
 .. _configuring:
 
 ==========================
-Aodh Configuration Options
+Configuration Guide
 ==========================
 
-Aodh Sample Configuration File
-==============================
+.. toctree::
+    aodh-config-file.rst
+    aodh-config-options.rst
 
-Configure Aodh by editing /etc/aodh/aodh.conf.
 
-No config file is provided with the source code, it will be created during
-the installation. In case where no configuration file was installed, one
-can be easily created by running::
 
-    aodh-config-generator
-
-The following is a sample Aodh configuration for adaptation and use. It is
-auto-generated from Aodh when this documentation is built, and can also be
-viewed in `file form <_static/aodh.conf.sample>`_.
-
-.. literalinclude:: ../_static/aodh.conf.sample