Revert "work around doc build error"

This reverts commit bb8dbeb3a3.

Making this work will depend on having a new release of oslo.config with
the fix in the dependent patch.

Depends-On: Ia024722d05ce8adaa57c58559cb42f2913653bb9
Change-Id: I33b37c74abf63bcaa95e668ec74c9c9849cc3773
Signed-off-by: Doug Hellmann <doug@doughellmann.com>

.gitignore

@@ -50,4 +50,3 @@ ChangeLog
 # Editors
 *~
 .*.swp
-/doc/source/sample.config

doc/source/conf.py

@@ -25,17 +25,9 @@ extensions = [
     #'sphinx.ext.intersphinx',
     'oslosphinx',
     'oslo_config.sphinxext',
-    'oslo_config.sphinxconfiggen',
     'stevedore.sphinxext',
 ]
 
-# NOTE(dhellmann): An issue with the oslo.config sphinx integration
-#                  makes the show-options directive here result in
-#                  duplicate target nodes being introduced. Until we
-#                  can fix that, use the other directive to dump a
-#                  config file and include it as literal text.
-config_generator_config_file = 'cors_config_file.cfg'
-
 # autodoc generation is a bit aggressive and a nuisance when doing heavy
 # text edit cycles.
 # execute "export SPHINX_DEBUG=1" in your terminal to disable

doc/source/cors.rst

@@ -125,14 +125,7 @@ configuration, this may be done as follows.::
 Configuration Options
 ---------------------
 
-.. NOTE(dhellmann): An issue with the oslo.config sphinx integration
-                    makes the show-options directive here result in
-                    duplicate target nodes being introduced. Until we
-                    can fix that, use the other directive to dump a
-                    config file and include it as literal text.
-.. .. show-options:: oslo.middleware.cors
-
-.. literalinclude:: sample.config
+.. show-options:: oslo.middleware.cors
 
 Module Documentation
 --------------------

doc/source/cors_config_file.cfg

@@ -1,2 +0,0 @@
-[DEFAULT]
-namespace = oslo.middleware.cors