From 88b24354a062b089d14ff2b3f9b3b2cbc9123449 Mon Sep 17 00:00:00 2001 From: "Dr. Jens Harbott" Date: Wed, 27 May 2020 11:06:55 +0000 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. Change-Id: I7f627fa0bb4850f4839b75df611fa5ab241f1219 --- devstack/lib/ironic | 2 +- zuul.d/project.yaml | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/devstack/lib/ironic b/devstack/lib/ironic index bc28bb39e5..27caa9d5d1 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -1713,7 +1713,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" diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index e4ae5ba347..cf9606f26d 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -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 @@ -51,7 +53,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