Browse Source

Merge "devstack: Use uwsgi binary from path; temporary disable grenade" into stable/train

tags/13.0.5
Zuul 3 weeks ago
committed by Gerrit Code Review
parent
commit
e314d95564
2 changed files with 4 additions and 3 deletions
  1. +1
    -1
      devstack/lib/ironic
  2. +3
    -2
      zuul.d/project.yaml

+ 1
- 1
devstack/lib/ironic View File

@@ -1669,7 +1669,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"


+ 3
- 2
zuul.d/project.yaml View File

@@ -15,7 +15,8 @@
- ironic-standalone
- ironic-tempest-functional-python2
- ironic-tempest-functional-python3
- ironic-grenade-dsvm
- ironic-grenade-dsvm:
voting: false
# Temporary disable voting because of end of cycle CI instability.
- ironic-grenade-dsvm-multinode-multitenant:
voting: false
@@ -50,7 +51,7 @@
- ironic-standalone
- ironic-tempest-functional-python2
- ironic-tempest-functional-python3
- ironic-grenade-dsvm
# - ironic-grenade-dsvm
# removing from voting due to end of cycle gate instability.
# - ironic-grenade-dsvm-multinode-multitenant
- ironic-tempest-ipa-partition-pxe_ipmitool-tinyipa-python3


Loading…
Cancel
Save