From 6f8fb5f181962090e7fbf61f8bc95be5b8c9e550 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Wed, 5 Jul 2017 14:44:35 +0200
Subject: [PATCH] Fix aodh-config-generator

This program does not work:
  Unable to build sample configuration file: Failed to find some config files: /home/jenkins/workspace/gate-aodh-python27-ubuntu-xenial/aodh/cmd/aodh-config-generator.conf

But the gate did not catch it because the returned value is still 0. This
patches fixes that.

It also fix the location of the aodh-config-generation.conf file to be in the
proper place, and remove the default output location since there is no such
directory in $PWD by default, obviously

Change-Id: Ib63bec174de0c3108d42ad0623baba96c6cbe78b
Closes-Bug: #1702476
---
 aodh/cmd/__init__.py                      | 5 +++--
 aodh/{ => cmd}/aodh-config-generator.conf | 1 -
 doc/source/conf.py                        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename aodh/{ => cmd}/aodh-config-generator.conf (90%)

diff --git a/aodh/cmd/__init__.py b/aodh/cmd/__init__.py
index a0817c171..0be90b5ec 100644
--- a/aodh/cmd/__init__.py
+++ b/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
diff --git a/aodh/aodh-config-generator.conf b/aodh/cmd/aodh-config-generator.conf
similarity index 90%
rename from aodh/aodh-config-generator.conf
rename to aodh/cmd/aodh-config-generator.conf
index cf47d9a0b..87648119f 100644
--- a/aodh/aodh-config-generator.conf
+++ b/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
diff --git a/doc/source/conf.py b/doc/source/conf.py
index c7e644f1f..f6c3088cb 100644
--- a/doc/source/conf.py
+++ b/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']