openstack
/
ironic
Code Issues Proposed changes

Merge "devstack: Use uwsgi binary from path; temporary disable grenade"

This commit is contained in:
Zuul 2020-06-15 16:55:25 +00:00 committed by Gerrit Code Review
parent df439697ae 88b24354a0
commit 4512c8ba8b
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

@ -1827,7 +1827,7 @@ function start_ironic_api {
fi
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
else
run_process ir-api "$IRONIC_BIN_DIR/ironic-api --config-file=$IRONIC_CONF_FILE"

6
zuul.d/project.yaml
View File

@ -14,7 +14,9 @@
- ironic-standalone-redfish:
voting: false
- 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.
- ironic-grenade-dsvm-multinode-multitenant:
voting: false
@ -53,7 +55,7 @@
- ironic-tox-unit-with-driver-libs
- ironic-standalone
- ironic-tempest-functional-python3
- ironic-grenade
# - ironic-grenade
# removing from voting due to end of cycle gate instability.
# - ironic-grenade-dsvm-multinode-multitenant
- ironic-tempest-partition-bios-redfish-pxe