diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-07-26 03:45:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-07-26 03:45:55 +0000 |
| commit | f1cc475e3f4a469a000f1431f89215e2f03d5e59 (patch) | |
| tree | bcaa81b80847af622e6c09605b8ed8971e10c0ba /devstack | |
| parent | 12d63a4192e8b1f42c4530dfeec9b9587aec91f8 (diff) | |
| parent | ad92c74078125dcbb685db5ddc7eed5b7ae60a5c (diff) | |
| download | ceilometer-f1cc475e3f4a469a000f1431f89215e2f03d5e59.tar.gz | |
Merge "fix service path for fedora"
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/plugin.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 5b6fb2a4..4c79927e 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" @@ -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 |