Merge "Using oslo-config-generator to instead of generate-config-file.sh"

etc/aodh/aodh-config-generator.conf

@@ -0,0 +1,10 @@
+[DEFAULT]
+output_file = etc/aodh/aodh.conf
+wrap_width = 79
+namespace = aodh
+namespace = oslo.db
+namespace = oslo.log
+namespace = oslo.messaging
+namespace = oslo.policy
+namespace = oslo.service.service
+namespace = keystonemiddleware.auth_token

generate-config-file.sh

@@ -1,9 +0,0 @@
-#!/bin/sh
-oslo-config-generator --output-file etc/aodh/aodh.conf \
-                      --namespace aodh \
-                      --namespace oslo.db \
-                      --namespace oslo.log \
-                      --namespace oslo.messaging \
-                      --namespace oslo.policy \
-                      --namespace oslo.service.service \
-                      --namespace keystonemiddleware.auth_token

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/aodh/aodh-config-generator.conf
 whitelist_externals = bash
 
 # TODO(ityaptin): With separation tests to unit and functional folders we need
@@ -65,7 +65,7 @@ commands =
     bash -c "find aodh -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/aodh/aodh-config-generator.conf
 
 [testenv:docs]
 commands = python setup.py build_sphinx