From 678f69b47993b605232540fb7cedb73384eadb6a Mon Sep 17 00:00:00 2001
From: Fei Long Wang <flwang@catalyst.net.nz>
Date: Fri, 17 Jun 2016 14:45:27 +1200
Subject: [PATCH] Support generating config automatically

Change-Id: I245cd34d595293556b7c9b006ea912d0ad562e95
---
 distil/config.py                    | 9 +++++++++
 etc/os-config-generator/distil.conf | 8 ++++++++
 setup.cfg                           | 3 +++
 tox.ini                             | 6 +++++-
 4 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 etc/os-config-generator/distil.conf

diff --git a/distil/config.py b/distil/config.py
index 9b12338..1fb92bd 100644
--- a/distil/config.py
+++ b/distil/config.py
@@ -98,6 +98,15 @@ CONF.register_opts(COLLECTOR_OPTS, group=COLLECTOR_GROUP)
 CONF.register_opts(RATER_OPTS, group=RATER_GROUP)
 
 
+def list_opts():
+    return [
+        (ODOO_GROUP, ODOO_OPTS),
+        (COLLECTOR_GROUP, COLLECTOR_OPTS),
+        (RATER_GROUP, RATER_OPTS),
+        (None, DEFAULT_OPTIONS)
+    ]
+
+
 def _register_keystoneauth_opts(conf):
     # Register keystone authentication related options.
     from keystonemiddleware import auth_token  # noqa
diff --git a/etc/os-config-generator/distil.conf b/etc/os-config-generator/distil.conf
new file mode 100644
index 0000000..824f40b
--- /dev/null
+++ b/etc/os-config-generator/distil.conf
@@ -0,0 +1,8 @@
+[DEFAULT]
+output_file = etc/distil.conf.sample
+namespace = distil.config
+namespace = oslo.db
+namespace = oslo.log
+namespace = oslo.messaging
+namespace = oslo.policy
+namespace = keystonemiddleware.auth_token
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index 52b37a1..1ac98dd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -31,6 +31,9 @@ console_scripts =
     distil-collector = distil.cmd.distil_collector:main
     distil-db-manage = distil.db.migration.cli:main
 
+oslo.config.opts =
+    distil.config = distil.config:list_opts
+
 distil.collector =
     ceilometer = distil.collector.ceilometer:CeilometerCollector
 
diff --git a/tox.ini b/tox.ini
index 42f9a8c..16c62d1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,py33,pep8
+envlist = py34,py27,pep8
 minversion = 1.6
 skipsdist = True
 
@@ -42,6 +42,10 @@ commands =
 setenv = VIRTUAL_ENV={envdir}
 commands = bash tools/lintstack.sh
 
+[testenv:genconfig]
+commands =
+  oslo-config-generator --config-file etc/os-config-generator/distil.conf --output-file etc/distil.conf.sample
+
 [flake8]
 ignore = F401,H302,H305,H306,H307,H404,H405
 show-source = true