openstack
/
ceilometer
Code Issues Proposed changes

Merge "fix service path for fedora"

This commit is contained in:
Jenkins 2017-07-26 03:45:55 +00:00 committed by Gerrit Code Review
parent 12d63a4192 ad92c74078
commit f1cc475e3f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/plugin.sh
View File

@ -224,7 +224,7 @@ function install_gnocchi {
rm -f "$GNOCCHI_UWSGI_FILE"
write_uwsgi_config "$GNOCCHI_UWSGI_FILE" "/usr/local/bin/gnocchi-api" "/metric"
write_uwsgi_config "$GNOCCHI_UWSGI_FILE" "$CEILOMETER_BIN_DIR/gnocchi-api" "/metric"
if [ -n "$GNOCCHI_COORDINATOR_URL" ]; then
iniset $GNOCCHI_CONF storage coordination_url "$GNOCCHI_COORDINATOR_URL"
@ -462,8 +462,8 @@ function install_ceilometerclient {
function start_ceilometer {
if [ "$CEILOMETER_BACKEND" = "gnocchi" ] ; then
run_process gnocchi-api "/usr/local/bin/uwsgi --ini $GNOCCHI_UWSGI_FILE" ""
run_process gnocchi-metricd "/usr/local/bin/gnocchi-metricd --config-file $GNOCCHI_CONF"
run_process gnocchi-api "$CEILOMETER_BIN_DIR/uwsgi --ini $GNOCCHI_UWSGI_FILE" ""
run_process gnocchi-metricd "$CEILOMETER_BIN_DIR/gnocchi-metricd --config-file $GNOCCHI_CONF"
wait_for_service 30 "$(gnocchi_service_url)"
$CEILOMETER_BIN_DIR/ceilometer-upgrade --skip-metering-database
fi