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
This commit is contained in:
Dmitry Tantsur 2020-06-15 11:43:58 +02:00
parent 52138f2c54
commit 47315f9d07
2 changed files with 4 additions and 3 deletions

View File

@ -153,7 +153,7 @@ function start_inspector {
if [[ "$IRONIC_INSPECTOR_STANDALONE" == "True" ]]; then if [[ "$IRONIC_INSPECTOR_STANDALONE" == "True" ]]; then
run_process ironic-inspector "$IRONIC_INSPECTOR_CMD" run_process ironic-inspector "$IRONIC_INSPECTOR_CMD"
else 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" run_process ironic-inspector-conductor "$IRONIC_INSPECTOR_CMD_CONDUCTOR"
fi fi

View File

@ -8,7 +8,8 @@
- release-notes-jobs-python3 - release-notes-jobs-python3
check: check:
jobs: jobs:
- ironic-inspector-grenade - ironic-inspector-grenade:
voting: false
- ironic-inspector-tempest - ironic-inspector-tempest
- ironic-inspector-tempest-discovery - ironic-inspector-tempest-discovery
- ironic-inspector-tempest-managed - ironic-inspector-tempest-managed
@ -24,7 +25,7 @@
gate: gate:
queue: ironic queue: ironic
jobs: jobs:
- ironic-inspector-grenade # - ironic-inspector-grenade
- ironic-inspector-tempest - ironic-inspector-tempest
- ironic-inspector-tempest-discovery - ironic-inspector-tempest-discovery
- ironic-inspector-tempest-managed - ironic-inspector-tempest-managed