baseman79
diff --git a/‎doc/ext/__init__.py‎ b/‎doc/ext/__init__.py‎
diff --git a/‎doc/ext/apidoc.py‎
Lines changed: 0 additions & 43 deletions b/‎doc/ext/apidoc.py‎
Lines changed: 0 additions & 43 deletions
diff --git a/‎doc/source/conf.py‎
Lines changed: 0 additions & 5 deletions b/‎doc/source/conf.py‎
Lines changed: 0 additions & 5 deletions
diff --git a/‎setup.cfg‎
Lines changed: 8 additions & 0 deletions b/‎setup.cfg‎
Lines changed: 8 additions & 0 deletions
@@ -22,10 +22,6 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..')))
 
-# NOTE(blk-u): Path for our Sphinx extension, remove when
-# https://launchpad.net/bugs/1260495 is fixed.
-sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
-
 # -- General configuration ----------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
@@ -37,7 +33,6 @@
               'sphinx.ext.doctest',
               'sphinx.ext.todo',
               'oslosphinx',
-              'ext.apidoc',
               'stevedore.sphinxext',
               ]
 
 
@@ -687,6 +687,14 @@ openstack.volume.v3 =
     volume_transfer_request_list = openstackclient.volume.v2.volume_transfer_request:ListTransferRequest
     volume_transfer_request_show = openstackclient.volume.v2.volume_transfer_request:ShowTransferRequest
 
+[pbr]
+autodoc_tree_index_modules = True
+autodoc_tree_excludes =
+    setup.py
+    openstackclient/volume/v3
+    openstackclient/tests/
+    openstackclient/tests/*
+
 [build_sphinx]
 source-dir = doc/source
 build-dir = doc/build