openstack
/
watcher
Code Issues Proposed changes

Use uwsgi binary from path and mark grenade non-voting 

Change-Id: Iaa6283e3f34166210cc2d0c918e610484bfd3ab9
This commit is contained in:
zhurong 2020-06-16 14:58:06 +08:00
parent 527578a147
commit 097ac06f0b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.zuul.yaml
View File

@ -204,6 +204,7 @@
timeout: 10800
run: playbooks/legacy/grenade-devstack-watcher/run.yaml
post-run: playbooks/legacy/grenade-devstack-watcher/post.yaml
voting: false
irrelevant-files:
- ^(test-|)requirements.txt$
- ^.*\.rst$

2
devstack/lib/watcher
View File

@ -298,7 +298,7 @@ function start_watcher_api {
service_protocol="http"
fi
if [[ "$WATCHER_USE_WSGI_MODE" == "uwsgi" ]]; then
run_process "watcher-api" "$WATCHER_BIN_DIR/uwsgi --procname-prefix watcher-api --ini $WATCHER_UWSGI_CONF"
run_process "watcher-api" "$(which uwsgi) --procname-prefix watcher-api --ini $WATCHER_UWSGI_CONF"
watcher_url=$service_protocol://$SERVICE_HOST/infra-optim
else
watcher_url=$service_protocol://$SERVICE_HOST:$service_port