openstack
/
panko
Code Issues Proposed changes

[Trivial] Remove CEILOMETER_API_LOG_DIR option for devstack 

This option is used for ceilometer-api when
CEILOMETER_USE_MOD_WSGI=False, and create a dedicate directory for
ceilometer-api log.

However, there is no such need, because for such case, ceilometer-api
is just a normal process like ceilometer-polling. 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
ceilometer-polling, by default, it will be /opt/stack/logs.

Change-Id: Icca16dbef53929686950a72b40b2544f45f4afdd
This commit is contained in:
ZhiQiang Fan 2016-04-28 01:43:53 +08:00
parent a42916ce34
commit 54887ff59e
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devstack/plugin.sh
View File

@ -213,10 +213,6 @@ function cleanup_ceilometer {
_drop_database
sudo rm -f "$CEILOMETER_CONF_DIR"/*
sudo rmdir "$CEILOMETER_CONF_DIR"
if is_service_enabled ceilometer-api && [ "$CEILOMETER_USE_MOD_WSGI" == "False" ]; then
sudo rm -f "$CEILOMETER_API_LOG_DIR"/*
sudo rmdir "$CEILOMETER_API_LOG_DIR"
fi
}
# Set configuraiton for cache backend.
@ -390,9 +386,6 @@ function install_ceilometer {
install_ceilometerclient
setup_develop $CEILOMETER_DIR
sudo install -d -o $STACK_USER -m 755 $CEILOMETER_CONF_DIR
if is_service_enabled ceilometer-api && [ "$CEILOMETER_USE_MOD_WSGI" == "False" ]; then
sudo install -d -o $STACK_USER -m 755 $CEILOMETER_API_LOG_DIR
fi
}
# install_ceilometerclient() - Collect source and prepare
@ -413,7 +406,7 @@ function start_ceilometer {
run_process ceilometer-aipmi "$CEILOMETER_BIN_DIR/ceilometer-polling --polling-namespaces ipmi --config-file $CEILOMETER_CONF"
if [[ "$CEILOMETER_USE_MOD_WSGI" == "False" ]]; then
run_process ceilometer-api "$CEILOMETER_BIN_DIR/ceilometer-api -d -v --log-dir=$CEILOMETER_API_LOG_DIR --config-file $CEILOMETER_CONF"
run_process ceilometer-api "$CEILOMETER_BIN_DIR/ceilometer-api -d -v --config-file $CEILOMETER_CONF"
elif is_service_enabled ceilometer-api; then
enable_apache_site ceilometer
restart_apache_server

1
devstack/settings
View File

@ -12,7 +12,6 @@ enable_service ceilometer-api
CEILOMETER_DIR=$DEST/ceilometer
CEILOMETER_CONF_DIR=/etc/ceilometer
CEILOMETER_CONF=$CEILOMETER_CONF_DIR/ceilometer.conf
CEILOMETER_API_LOG_DIR=/var/log/ceilometer-api
CEILOMETER_AUTH_CACHE_DIR=${CEILOMETER_AUTH_CACHE_DIR:-/var/cache/ceilometer}
CEILOMETER_WSGI_DIR=${CEILOMETER_WSGI_DIR:-/var/www/ceilometer}