From ad92c74078125dcbb685db5ddc7eed5b7ae60a5c Mon Sep 17 00:00:00 2001 From: gord chung Date: Wed, 14 Jun 2017 20:07:37 +0000 Subject: fix service path for fedora fedora uses /usr/bin and not /usr/local/bin Change-Id: I2fde1cb5a0ad0a44213e9959c9edcdeeac1445c5 --- devstack/plugin.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'devstack') diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 81a7a2e4..0168f781 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -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" @@ -461,8 +461,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 -- cgit v1.2.1