openstack
/
ironic
Code Issues Proposed changes

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.

Change-Id: I7f627fa0bb4850f4839b75df611fa5ab241f1219
(cherry picked from commit 88b24354a0)
This commit is contained in:
Dr. Jens Harbott 2020-05-27 11:06:55 +00:00 committed by Iury Gregory Melo Ferreira
parent 45fdeaa588
commit f17b9e4ab3
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/lib/ironic
View File

@ -1716,7 +1716,7 @@ function start_ironic_api {
fi fi
if [[ "$IRONIC_USE_WSGI" == "True" ]]; then if [[ "$IRONIC_USE_WSGI" == "True" ]]; then
run_process "ir-api" "$IRONIC_BIN_DIR/uwsgi --procname-prefix ironic-api --ini $IRONIC_UWSGI_CONF" run_process "ir-api" "$(which uwsgi) --procname-prefix ironic-api --ini $IRONIC_UWSGI_CONF"
ironic_url=$service_protocol://$SERVICE_HOST/baremetal ironic_url=$service_protocol://$SERVICE_HOST/baremetal
else else
run_process ir-api "$IRONIC_BIN_DIR/ironic-api --config-file=$IRONIC_CONF_FILE" run_process ir-api "$IRONIC_BIN_DIR/ironic-api --config-file=$IRONIC_CONF_FILE"

6
zuul.d/project.yaml
View File

@ -12,7 +12,9 @@
- ironic-tox-unit-with-driver-libs - ironic-tox-unit-with-driver-libs
- ironic-standalone - ironic-standalone
- ironic-tempest-functional-python3 - ironic-tempest-functional-python3
- ironic-grenade # FIXME(dtantsur): disable because of the uWSGI problem
- ironic-grenade:
voting: false
# Temporary disable voting because of end of cycle CI instability. # Temporary disable voting because of end of cycle CI instability.
- ironic-grenade-dsvm-multinode-multitenant: - ironic-grenade-dsvm-multinode-multitenant:
voting: false voting: false
@ -50,7 +52,7 @@
- ironic-tox-unit-with-driver-libs - ironic-tox-unit-with-driver-libs
- ironic-standalone - ironic-standalone
- ironic-tempest-functional-python3 - ironic-tempest-functional-python3
- ironic-grenade # - ironic-grenade
# removing from voting due to end of cycle gate instability. # removing from voting due to end of cycle gate instability.
# - ironic-grenade-dsvm-multinode-multitenant # - ironic-grenade-dsvm-multinode-multitenant
- ironic-tempest-partition-bios-redfish-pxe - ironic-tempest-partition-bios-redfish-pxe