openstack/aodh
Code Issues Proposed changes

move aodh-config-generator.conf to etc/aodh dir

Browse Source 
This will allow package or devstack to install
aodh-config-generator.conf under /etc/aodh, which enables end users
run ``oslo-config-generator \
--config-file=/etc/aodh/aodh-config-generator.conf \
--output-file=/etc/aodh/aodh.conf`` to generate a sample
configuration file.

Change-Id: Ib7986d689386d2f44f72754661e328967d94e88d
This commit is contained in:
ZhiQiang Fan 2016-05-10 18:52:57 +08:00
parent 112250e14e
commit 229d35adbd
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devstack/plugin.sh
View File

@ -218,6 +218,7 @@ function configure_aodh {
iniset $AODH_CONF oslo_policy policy_file $AODH_CONF_DIR/policy.json iniset $AODH_CONF oslo_policy policy_file $AODH_CONF_DIR/policy.json
cp $AODH_DIR/etc/aodh/api_paste.ini $AODH_CONF_DIR cp $AODH_DIR/etc/aodh/api_paste.ini $AODH_CONF_DIR
cp $AODH_DIR/etc/aodh/aodh-config-generator.conf $AODH_CONF_DIR
# The alarm evaluator needs these options to call gnocchi/ceilometer APIs # The alarm evaluator needs these options to call gnocchi/ceilometer APIs
iniset $AODH_CONF service_credentials auth_type password iniset $AODH_CONF service_credentials auth_type password

0
aodh-config-generator.conf → etc/aodh/aodh-config-generator.conf
View File

4
tox.ini
View File

@ -12,7 +12,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}"
oslo-config-generator --config-file=aodh-config-generator.conf oslo-config-generator --config-file=etc/aodh/aodh-config-generator.conf
whitelist_externals = bash whitelist_externals = bash
[testenv:py27-hbase] [testenv:py27-hbase]
@ -72,7 +72,7 @@ deps = .[doc]
commands = sphinx-build -a -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html commands = sphinx-build -a -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
[testenv:genconfig] [testenv:genconfig]
commands = oslo-config-generator --config-file=aodh-config-generator.conf commands = oslo-config-generator --config-file=etc/aodh/aodh-config-generator.conf
[testenv:docs] [testenv:docs]
deps = .[doc] deps = .[doc]