openstack/aodh
Code Issues Proposed changes

[Trivial] Remove AODH_API_LOG_DIR option for devstack

Browse Source 
This option is used for aodh-api when AODH_DEPLOY=werkzeug,
and create a dedicate directory for aodh-api log.

However, there is no such need, because for such case, aodh-api
is just a normal process like aodh-evaluator. We should let
oslo.log decide where to store the log, image that user configures
a path and we override in installation process, then he needs to hack
into screenrc to adjust the path, it is not friendly.

Here I propose to put the api log files in same directory as
aodh-evaluator, by default, it will be /opt/stack/logs.

Change-Id: If758cb7ddcc0087ed495721eeccf4723900e2ef3
This commit is contained in:
ZhiQiang Fan 2016-04-28 01:50:38 +08:00
parent 267ecbbabf
commit 85c207fe52
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/plugin.sh
View File

@ -293,7 +293,7 @@ function install_aodh {
_aodh_prepare_storage_backend
install_aodhclient
sudo -H pip install -e "$AODH_DIR"[test,$AODH_BACKEND]
sudo install -d -o $STACK_USER -m 755 $AODH_CONF_DIR $AODH_API_LOG_DIR
sudo install -d -o $STACK_USER -m 755 $AODH_CONF_DIR
if [ "$AODH_DEPLOY" == "mod_wsgi" ]; then
install_apache_wsgi
@ -323,7 +323,7 @@ function start_aodh {
elif [ "$AODH_DEPLOY" == "uwsgi" ]; then
run_process aodh-api "$AODH_BIN_DIR/uwsgi $AODH_UWSGI_FILE"
else
run_process aodh-api "$AODH_BIN_DIR/aodh-api -d -v --log-dir=$AODH_API_LOG_DIR --config-file $AODH_CONF"
run_process aodh-api "$AODH_BIN_DIR/aodh-api -d -v --config-file $AODH_CONF"
fi
# Only die on API if it was actually intended to be turned on

1
devstack/settings
View File

@ -10,7 +10,6 @@ enable_service aodh-listener
AODH_DIR=$DEST/aodh
AODH_CONF_DIR=/etc/aodh
AODH_CONF=$AODH_CONF_DIR/aodh.conf
AODH_API_LOG_DIR=/var/log/aodh-api
AODH_AUTH_CACHE_DIR=${AODH_AUTH_CACHE_DIR:-/var/cache/aodh}
AODH_WSGI_DIR=${AODH_WSGI_DIR:-/var/www/aodh}