From 2a7969b04de826fce15ee24ef27c2d64a9d6926c Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Thu, 8 May 2025 13:18:33 +0100 Subject: [PATCH] Deploy neutron under uWSGI by default Required so we can do this in DevStack [1]. We temporarily make the grenade job non-voting so we can get this in. [1] https://review.opendev.org/c/openstack/devstack/+/932199 Change-Id: Id9c51752ce9f3c6ffa1f160d4ada18a86083610d Signed-off-by: Stephen Finucane --- .zuul.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index ff75de5a..a3e5eeea 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -8,7 +8,10 @@ # TODO(gmann) heat job is failing 100%, make it voting again once it is green. - grenade-heat-multinode: voting: false - - octavia-grenade + # TODO(stephenfin): make this voting once we fix octavia + # https://review.opendev.org/c/openstack/octavia/+/949601 + - octavia-grenade: + voting: false - ironic-grenade: voting: false - grenade-skip-level-always @@ -17,7 +20,7 @@ - grenade - grenade-multinode # - grenade-heat-multinode - - octavia-grenade + # - octavia-grenade - grenade-skip-level-always experimental: jobs: @@ -194,6 +197,8 @@ DATABASE_TYPE: mysql # Glance should always be non-standalone GLANCE_STANDALONE: False + # Neutron should always deploy using uWSGI by default now + NEUTRON_DEPLOY_MOD_WSGI: True devstack_local_conf: post-config: $NEUTRON_CONF: