openstack/ceilometer
Code Issues Proposed changes

Merge "devstack: Use global uwsgi"

Browse Source
This commit is contained in:
Zuul
2025-10-07 07:21:28 +00:00
committed by Gerrit Code Review
parent 6862762080 93e71c7f4f
commit 3e846cbbdb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/plugin.sh
View File

@@ -115,9 +115,9 @@ function install_gnocchi {
# to the global git repo list and ensure its cloned as the current user # to the global git repo list and ensure its cloned as the current user
# not as root. # not as root.
git_clone ${GNOCCHI_REPO} ${GNOCCHI_DIR} ${GNOCCHI_BRANCH} git_clone ${GNOCCHI_REPO} ${GNOCCHI_DIR} ${GNOCCHI_BRANCH}
pip_install -e ${GNOCCHI_DIR}[redis,${DATABASE_TYPE},keystone] uwsgi pip_install -e ${GNOCCHI_DIR}[redis,${DATABASE_TYPE},keystone]
else else
pip_install gnocchi[redis,${DATABASE_TYPE},keystone] uwsgi pip_install gnocchi[redis,${DATABASE_TYPE},keystone]
fi fi
} }
@@ -290,7 +290,7 @@ function install_ceilometer {
function start_ceilometer { function start_ceilometer {
if [[ "$CEILOMETER_BACKENDS" =~ "gnocchi" ]] ; then if [[ "$CEILOMETER_BACKENDS" =~ "gnocchi" ]] ; then
run_process gnocchi-api "$CEILOMETER_BIN_DIR/uwsgi --ini $GNOCCHI_UWSGI_FILE" "" run_process gnocchi-api "$(which uwsgi) --ini $GNOCCHI_UWSGI_FILE" ""
run_process gnocchi-metricd "$CEILOMETER_BIN_DIR/gnocchi-metricd --config-file $GNOCCHI_CONF" run_process gnocchi-metricd "$CEILOMETER_BIN_DIR/gnocchi-metricd --config-file $GNOCCHI_CONF"
wait_for_service 30 "$(gnocchi_service_url)" wait_for_service 30 "$(gnocchi_service_url)"
$CEILOMETER_BIN_DIR/ceilometer-upgrade $CEILOMETER_BIN_DIR/ceilometer-upgrade