diff --git a/devstack/plugin.sh b/devstack/plugin.sh index a9ba5ecb8c..dce40f0d98 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -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 diff --git a/devstack/settings b/devstack/settings index be57dafbac..06c7c0ce42 100644 --- a/devstack/settings +++ b/devstack/settings @@ -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}