From 3587ce9fdfe09334957ae10103fcdb97ef79686c Mon Sep 17 00:00:00 2001
From: liusheng <liusheng@huawei.com>
Date: Tue, 20 Oct 2015 17:24:55 +0800
Subject: [PATCH] Using oslo-config-generator to instead of
 generate-config-file.sh

We don't need a separate script to wrap the oslo-config-generator. Like
other projects, we can just specify a config-generator config file to
define the namespaces.

Change-Id: I9ee06658d49163f041df18a62b33fa2804f545b8
---
 etc/ceilometer/ceilometer-config-generator.conf | 11 +++++++++++
 generate-config-file.sh                         | 10 ----------
 tox.ini                                         |  4 ++--
 3 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100644 etc/ceilometer/ceilometer-config-generator.conf
 delete mode 100755 generate-config-file.sh

diff --git a/etc/ceilometer/ceilometer-config-generator.conf b/etc/ceilometer/ceilometer-config-generator.conf
new file mode 100644
index 00000000..222df01f
--- /dev/null
+++ b/etc/ceilometer/ceilometer-config-generator.conf
@@ -0,0 +1,11 @@
+[DEFAULT]
+output_file = etc/ceilometer/ceilometer.conf
+wrap_width = 79
+namespace = ceilometer
+namespace = oslo.concurrency
+namespace = oslo.db
+namespace = oslo.log
+namespace = oslo.messaging
+namespace = oslo.policy
+namespace = oslo.service.service
+namespace = keystonemiddleware.auth_token
diff --git a/generate-config-file.sh b/generate-config-file.sh
deleted file mode 100755
index 7ad939f7..00000000
--- a/generate-config-file.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-oslo-config-generator --output-file etc/ceilometer/ceilometer.conf \
-    --namespace ceilometer \
-    --namespace oslo.concurrency \
-    --namespace oslo.db \
-    --namespace oslo.log \
-    --namespace oslo.messaging \
-    --namespace oslo.policy \
-    --namespace oslo.service.service \
-    --namespace keystonemiddleware.auth_token
diff --git a/tox.ini b/tox.ini
index 0de2e4d7..bae3bf8e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,7 @@ setenv = VIRTUAL_ENV={envdir}
 passenv = OS_TEST_TIMEOUT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE
 commands =
    python setup.py testr --slowest --testr-args="{posargs}"
-   {toxinidir}/generate-config-file.sh
+   oslo-config-generator --config-file=etc/ceilometer/ceilometer-config-generator.conf
 whitelist_externals = bash
 
 # TODO(ityaptin): With separation tests to unit and functional folders we need
@@ -95,7 +95,7 @@ commands =
     bash -c "find ceilometer -type f -regex '.*\.pot?' -print0|xargs -0 -n 1 msgfmt --check-format -o /dev/null"
 
 [testenv:genconfig]
-commands = {toxinidir}/generate-config-file.sh
+commands = oslo-config-generator --config-file=etc/ceilometer/ceilometer-config-generator.conf
 
 [testenv:docs]
 commands = python setup.py build_sphinx