From 23f65cb9d77cac11101dc7f25c3b8a6a25a73d53 Mon Sep 17 00:00:00 2001 From: Chris Dent Date: Wed, 9 Sep 2015 08:33:15 +0000 Subject: [PATCH] Update lib/ceilometer to reflect script renames Without this change some services for ceilometer will not start breaking CI. This change I7447ba4f408c95b0acf1b809504ce16fff1c6e21 was validated against the ceilometer devstack plugin but apparently not against devstack itself. Until I413ab159474b7d7231ad66d3a482201f74efe8a8 merges devstack still has ceilometer support and is used in the gate. Change-Id: Ib1ea8b6ef7019570f82b0ba87e03fc627c8f6801 --- lib/ceilometer | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/ceilometer b/lib/ceilometer index d1cc862160..c6c4c87fbc 100644 --- a/lib/ceilometer +++ b/lib/ceilometer @@ -360,10 +360,10 @@ function install_ceilometerclient { # start_ceilometer() - Start running processes, including screen function start_ceilometer { - run_process ceilometer-acentral "$CEILOMETER_BIN_DIR/ceilometer-agent-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-collector "$CEILOMETER_BIN_DIR/ceilometer-collector --config-file $CEILOMETER_CONF" - run_process ceilometer-aipmi "$CEILOMETER_BIN_DIR/ceilometer-agent-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 run_process ceilometer-api "$CEILOMETER_BIN_DIR/ceilometer-api -d -v --log-dir=$CEILOMETER_API_LOG_DIR --config-file $CEILOMETER_CONF" @@ -378,10 +378,10 @@ function start_ceilometer { # Start the compute agent last to allow time for the collector to # fully wake up and connect to the message bus. See bug #1355809 if [[ "$VIRT_DRIVER" = 'libvirt' ]]; then - run_process ceilometer-acompute "$CEILOMETER_BIN_DIR/ceilometer-agent-compute --config-file $CEILOMETER_CONF" $LIBVIRT_GROUP + run_process ceilometer-acompute "$CEILOMETER_BIN_DIR/ceilometer-polling --polling-namespaces compute --config-file $CEILOMETER_CONF" $LIBVIRT_GROUP fi if [[ "$VIRT_DRIVER" = 'vsphere' ]]; then - run_process ceilometer-acompute "$CEILOMETER_BIN_DIR/ceilometer-agent-compute --config-file $CEILOMETER_CONF" + run_process ceilometer-acompute "$CEILOMETER_BIN_DIR/ceilometer-polling --polling-namespaces compute --config-file $CEILOMETER_CONF" fi # Only die on API if it was actually intended to be turned on