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 <stephenfin@redhat.com>

.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: