From 47315f9d074cc0358ce93a1e44667149ce6a7f2d Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Mon, 15 Jun 2020 11:43:58 +0200 Subject: [PATCH] devstack: Use uwsgi binary from path; temporary disable grenade The previous uwsgi invocation assumed that the uwsgi binary is in the same directory as the project binaries are installed into (probably /usr/bin). That may not be correct -- for example if using a packaged uwsgi on Fedora the binary will live in /usr/sbin/uwsgi (not /usr/bin where the project files from pip are). Switch the invocation to just find it in the path. Additionally, grenade is disabled, otherwise we cannot land this change without fixing stable branches first. Depends-On: https://review.opendev.org/#/c/731159/ Change-Id: I66d0554dc6d0ec6ef019b5310cd887a5415c2e03 --- devstack/plugin.sh | 2 +- zuul.d/project.yaml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index ef89b81e8..1b00473ce 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -153,7 +153,7 @@ function start_inspector { if [[ "$IRONIC_INSPECTOR_STANDALONE" == "True" ]]; then run_process ironic-inspector "$IRONIC_INSPECTOR_CMD" else - run_process ironic-inspector-api "$IRONIC_INSPECTOR_BIN_DIR/uwsgi --procname-prefix ironic-inspector-api --ini $IRONIC_INSPECTOR_UWSGI_CONF --pyargv \"--config-file $IRONIC_INSPECTOR_CONF_FILE\"" + run_process ironic-inspector-api "$(which uwsgi) --procname-prefix ironic-inspector-api --ini $IRONIC_INSPECTOR_UWSGI_CONF --pyargv \"--config-file $IRONIC_INSPECTOR_CONF_FILE\"" run_process ironic-inspector-conductor "$IRONIC_INSPECTOR_CMD_CONDUCTOR" fi diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 92271be88..50653b36d 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -8,7 +8,8 @@ - release-notes-jobs-python3 check: jobs: - - ironic-inspector-grenade + - ironic-inspector-grenade: + voting: false - ironic-inspector-tempest - ironic-inspector-tempest-discovery - ironic-inspector-tempest-managed @@ -24,7 +25,7 @@ gate: queue: ironic jobs: - - ironic-inspector-grenade + # - ironic-inspector-grenade - ironic-inspector-tempest - ironic-inspector-tempest-discovery - ironic-inspector-tempest-managed