summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorliusheng <liusheng@huawei.com>2015-10-20 17:24:55 +0800
committerliusheng <liusheng@huawei.com>2015-10-20 17:38:57 +0800
commit3587ce9fdfe09334957ae10103fcdb97ef79686c (patch)
treee367cfc3fdbb18ae9215c07951e27c50c0385150 /tox.ini
parent3a3093afa627dc5c5a058a9e5e2ce67c641202e5 (diff)
downloadceilometer-3587ce9fdfe09334957ae10103fcdb97ef79686c.tar.gz
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
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini4
1 files changed, 2 insertions, 2 deletions
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