summaryrefslogtreecommitdiff
path: root/devstack
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-28 20:40:42 +0000
committerGerrit Code Review <review@openstack.org>2017-03-28 20:40:42 +0000
commitc91b377291ceecf26d650686fdc446511af062f2 (patch)
tree8bb9d5eed76082215bf88370b01d5bb831fac1cb /devstack
parent36237047cdacfad6ca328cda41947209834f6680 (diff)
parent0c398ecab4ae5df8a8cacc8f5489c2d9573d6ddc (diff)
downloadceilometer-c91b377291ceecf26d650686fdc446511af062f2.tar.gz
Merge "start notification agent after restarting apache"
Diffstat (limited to 'devstack')
-rw-r--r--devstack/plugin.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 0962b3ce..05d3b5fc 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -411,7 +411,6 @@ function install_ceilometerclient {
# start_ceilometer() - Start running processes, including screen
function start_ceilometer {
run_process ceilometer-acentral "$CEILOMETER_BIN_DIR/ceilometer-polling --polling-namespaces central --config-file $CEILOMETER_CONF"
- run_process ceilometer-anotification "$CEILOMETER_BIN_DIR/ceilometer-agent-notification --config-file $CEILOMETER_CONF"
run_process ceilometer-aipmi "$CEILOMETER_BIN_DIR/ceilometer-polling --polling-namespaces ipmi --config-file $CEILOMETER_CONF"
if [[ "$CEILOMETER_USE_MOD_WSGI" == "False" ]]; then
@@ -423,8 +422,9 @@ function start_ceilometer {
tail_log ceilometer-api /var/log/$APACHE_NAME/ceilometer_access.log
fi
- # run the collector after restarting apache as it needs
+ # run the notification agent/collector after restarting apache as it needs
# operational keystone if using gnocchi
+ run_process ceilometer-anotification "$CEILOMETER_BIN_DIR/ceilometer-agent-notification --config-file $CEILOMETER_CONF"
run_process ceilometer-collector "$CEILOMETER_BIN_DIR/ceilometer-collector --config-file $CEILOMETER_CONF"
# Start the compute agent late to allow time for the collector to