openstack/deb-ceilometer
Code Issues Proposed changes

Remove last vestiges of devstack from grenade plugin

Browse Source 
lib/ceilometer no longer exits so we must source our plugin to get
stop_ceilometer

Change-Id: I059cc24eae046df195573c0f1a90cd52e8ef1c7e
Depends-On: I01d00f95d602b9b159b3b64ff46a7cd3e23c3983
This commit is contained in:
Chris Dent 2015-10-05 14:27:50 +00:00 committed by Sean Dague
parent cc960ce7f8
commit 0f0b725935
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devstack/plugin.sh
View File

@ -381,9 +381,12 @@ function stop_ceilometer {
if [ "$CEILOMETER_USE_MOD_WSGI" == "True" ]; then if [ "$CEILOMETER_USE_MOD_WSGI" == "True" ]; then
disable_apache_site ceilometer disable_apache_site ceilometer
restart_apache_server restart_apache_server
else
stop_process ceilometer-api
fi fi
# Kill the ceilometer screen windows # Kill the ceilometer screen windows
for serv in ceilometer-acompute ceilometer-acentral ceilometer-aipmi ceilometer-anotification ceilometer-collector ceilometer-api ceilometer-alarm-notifier ceilometer-alarm-evaluator; do for serv in ceilometer-acompute ceilometer-acentral ceilometer-aipmi ceilometer-anotification ceilometer-collector ceilometer-alarm-notifier ceilometer-alarm-evaluator; do
stop_process $serv stop_process $serv
done done
} }

14
devstack/upgrade/shutdown.sh
View File

@ -7,15 +7,21 @@ set -o errexit
source $GRENADE_DIR/grenaderc source $GRENADE_DIR/grenaderc
source $GRENADE_DIR/functions source $GRENADE_DIR/functions
# We need base DevStack functions for this.
# TODO(chdent): This relies on the fact that for now base devstack is
# hosting ceilometer itself. Once M* starts this will need to be smarter.
source $BASE_DEVSTACK_DIR/functions source $BASE_DEVSTACK_DIR/functions
source $BASE_DEVSTACK_DIR/stackrc # needed for status directory source $BASE_DEVSTACK_DIR/stackrc # needed for status directory
source $BASE_DEVSTACK_DIR/lib/tls source $BASE_DEVSTACK_DIR/lib/tls
source $BASE_DEVSTACK_DIR/lib/apache source $BASE_DEVSTACK_DIR/lib/apache
source $BASE_DEVSTACK_DIR/lib/ceilometer
# Locate the ceilometer plugin and get its functions
CEILOMETER_DEVSTACK_DIR=$(dirname $(dirname $0))
source $CEILOMETER_DEVSTACK_DIR/plugin.sh
set -o xtrace set -o xtrace
stop_ceilometer stop_ceilometer
# ensure everything is stopped
SERVICES_DOWN="ceilometer-acompute ceilometer-acentral ceilometer-aipmi ceilometer-anotification ceilometer-collector ceilometer-api ceilometer-alarm-notifier ceilometer-alarm-evaluator"
ensure_services_stopped $SERVICES_DOWN