From 097ac06f0b81377a4184c20433d1cb0845de5623 Mon Sep 17 00:00:00 2001 From: zhurong Date: Tue, 16 Jun 2020 14:58:06 +0800 Subject: [PATCH] Use uwsgi binary from path and mark grenade non-voting Change-Id: Iaa6283e3f34166210cc2d0c918e610484bfd3ab9 --- .zuul.yaml | 1 + devstack/lib/watcher | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.zuul.yaml b/.zuul.yaml index f59ab228c..264df5ce2 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -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$ diff --git a/devstack/lib/watcher b/devstack/lib/watcher index 577ac01e5..7108a4695 100644 --- a/devstack/lib/watcher +++ b/devstack/lib/watcher @@ -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