Merge "Rename ceilometer alarm service name"

This commit is contained in:
Jenkins 2013-09-06 16:32:51 +00:00 committed by Gerrit Code Review
commit 8a67fec119

View File

@ -5,7 +5,7 @@
# enable_service ceilometer-acompute ceilometer-acentral ceilometer-collector ceilometer-api # enable_service ceilometer-acompute ceilometer-acentral ceilometer-collector ceilometer-api
# #
# To ensure Ceilometer alarming services are enabled also, further add to the localrc: # To ensure Ceilometer alarming services are enabled also, further add to the localrc:
# enable_service ceilometer-alarm-notify ceilometer-alarm-eval # enable_service ceilometer-alarm-notifier ceilometer-alarm-singleton
# Dependencies: # Dependencies:
# - functions # - functions
@ -138,14 +138,14 @@ function start_ceilometer() {
screen_it ceilometer-acentral "ceilometer-agent-central --config-file $CEILOMETER_CONF" screen_it ceilometer-acentral "ceilometer-agent-central --config-file $CEILOMETER_CONF"
screen_it ceilometer-collector "ceilometer-collector --config-file $CEILOMETER_CONF" screen_it ceilometer-collector "ceilometer-collector --config-file $CEILOMETER_CONF"
screen_it ceilometer-api "ceilometer-api -d -v --log-dir=$CEILOMETER_API_LOG_DIR --config-file $CEILOMETER_CONF" screen_it ceilometer-api "ceilometer-api -d -v --log-dir=$CEILOMETER_API_LOG_DIR --config-file $CEILOMETER_CONF"
screen_it ceilometer-alarm-notify "ceilometer-alarm-notifier --config-file $CEILOMETER_CONF" screen_it ceilometer-alarm-notifier "ceilometer-alarm-notifier --config-file $CEILOMETER_CONF"
screen_it ceilometer-alarm-eval "ceilometer-alarm-singleton --config-file $CEILOMETER_CONF" screen_it ceilometer-alarm-singleton "ceilometer-alarm-singleton --config-file $CEILOMETER_CONF"
} }
# stop_ceilometer() - Stop running processes # stop_ceilometer() - Stop running processes
function stop_ceilometer() { function stop_ceilometer() {
# Kill the ceilometer screen windows # Kill the ceilometer screen windows
for serv in ceilometer-acompute ceilometer-acentral ceilometer-collector ceilometer-api ceilometer-alarm-notify ceilometer-alarm-eval; do for serv in ceilometer-acompute ceilometer-acentral ceilometer-collector ceilometer-api ceilometer-alarm-notifier ceilometer-alarm-singleton; do
screen -S $SCREEN_NAME -p $serv -X kill screen -S $SCREEN_NAME -p $serv -X kill
done done
} }