Merge "Fix aodh-config-generator"

aodh/cmd/__init__.py

@@ -14,15 +14,16 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import os
+import sys
 
 
 def config_generator():
-    args = ['--output-file', 'etc/aodh/aodh.conf']
     try:
         from oslo_config import generator
         generator.main(
             ['--config-file',
              '%s/aodh-config-generator.conf' % os.path.dirname(__file__)]
-            + args)
+            + sys.argv[1:])
     except Exception as e:
         print("Unable to build sample configuration file: %s" % e)
+        return 1

aodh/cmd/aodh-config-generator.conf

@@ -1,5 +1,4 @@
 [DEFAULT]
-output_file = etc/aodh/aodh.conf
 wrap_width = 79
 namespace = aodh
 namespace = aodh-auth

doc/source/conf.py

@@ -52,7 +52,7 @@ extensions = [
 ]
 
 config_generator_config_file = os.path.join(ROOT,
-                                            'aodh/aodh-config-generator.conf')
+                                            'aodh/cmd/aodh-config-generator.conf')
 sample_config_basename = '_static/aodh'
 
 wsme_protocols = ['restjson', 'restxml']