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
This commit is contained in:
liusheng 2015-10-20 17:24:55 +08:00
parent 3a3093afa6
commit 3587ce9fdf
3 changed files with 13 additions and 12 deletions

View File

@ -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

View File

@ -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

View File

@ -14,7 +14,7 @@ setenv = VIRTUAL_ENV={envdir}
passenv = OS_TEST_TIMEOUT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE passenv = OS_TEST_TIMEOUT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE
commands = commands =
python setup.py testr --slowest --testr-args="{posargs}" 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 whitelist_externals = bash
# TODO(ityaptin): With separation tests to unit and functional folders we need # 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" bash -c "find ceilometer -type f -regex '.*\.pot?' -print0|xargs -0 -n 1 msgfmt --check-format -o /dev/null"
[testenv:genconfig] [testenv:genconfig]
commands = {toxinidir}/generate-config-file.sh commands = oslo-config-generator --config-file=etc/ceilometer/ceilometer-config-generator.conf
[testenv:docs] [testenv:docs]
commands = python setup.py build_sphinx commands = python setup.py build_sphinx