openstack/deb-ceilometer
Code Issues Proposed changes

Merge "Delay the start of the collector until after apache restart"

Browse Source
This commit is contained in:
Jenkins 2015-07-17 17:23:17 +00:00 committed by Gerrit Code Review
commit ef31b6b4f0
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devstack/plugin.sh
View File

@ -336,7 +336,6 @@ function install_ceilometerclient {
function start_ceilometer { function start_ceilometer {
run_process ceilometer-acentral "$CEILOMETER_BIN_DIR/ceilometer-polling --polling-namespaces central --config-file $CEILOMETER_CONF" 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-anotification "$CEILOMETER_BIN_DIR/ceilometer-agent-notification --config-file $CEILOMETER_CONF"
run_process ceilometer-collector "$CEILOMETER_BIN_DIR/ceilometer-collector --config-file $CEILOMETER_CONF"
run_process ceilometer-aipmi "$CEILOMETER_BIN_DIR/ceilometer-polling --polling-namespaces ipmi --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 if [[ "$CEILOMETER_USE_MOD_WSGI" == "False" ]]; then
@ -348,6 +347,10 @@ function start_ceilometer {
tail_log ceilometer-api /var/log/$APACHE_NAME/ceilometer_access.log tail_log ceilometer-api /var/log/$APACHE_NAME/ceilometer_access.log
fi fi
# run the the collector after restarting apache as it needs
# operational keystone if using gnocchi
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 # Start the compute agent late to allow time for the collector to
# fully wake up and connect to the message bus. See bug #1355809 # fully wake up and connect to the message bus. See bug #1355809
if [[ "$VIRT_DRIVER" = 'libvirt' ]]; then if [[ "$VIRT_DRIVER" = 'libvirt' ]]; then