diff --git a/doc/source/conf.py b/doc/source/conf.py
index 66674596cf..425188c20c 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -39,7 +39,7 @@ on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.todo', 'sphinx.ext.coverage',
               'sphinx.ext.viewcode', 'sphinxcontrib.httpdomain', 'oslo_config.sphinxconfiggen',
-              'openstackdocstheme']
+              'oslo_config.sphinxext', 'openstackdocstheme']
 
 # openstackdocstheme options
 repository_name = 'openstack/sahara'
diff --git a/doc/source/configuration/descriptionconfig.rst b/doc/source/configuration/descriptionconfig.rst
new file mode 100644
index 0000000000..065ab0321b
--- /dev/null
+++ b/doc/source/configuration/descriptionconfig.rst
@@ -0,0 +1,8 @@
+Configuration options
+=====================
+
+This section provides a list of the configuration options that can
+be set in the sahara configuration file.
+
+.. show-options::
+   :config-file: tools/config/config-generator.sahara.conf
diff --git a/doc/source/configuration/index.rst b/doc/source/configuration/index.rst
index 97b896b8fe..fad26d5e4a 100644
--- a/doc/source/configuration/index.rst
+++ b/doc/source/configuration/index.rst
@@ -2,7 +2,9 @@
 Configuration Reference
 =======================
 
+
 .. toctree::
    :maxdepth: 1
 
+   descriptionconfig
    sampleconfig