Move grenade skip-level jobs to start from 2024.2

As our master branch is 2025.2 (Flamingo), we should run grenade
skip-level from stable/2024.2 instead of 2024.1.

I also reverted designate-grenade-bind9-skip-level to be a voting job
again.

Change-Id: I53d1315d373bb08ad9f295c5aa7bb78a25ae6a74

.zuul.yaml

@@ -137,8 +137,19 @@
         s-object: false
         s-proxy: false
         c-bak: false
+        neutron-dns: true
+        q-svc: false
+        neutron-api: true
+        neutron-ovn-maintenance-worker: true
+        neutron-rpc-server: false
+        neutron-periodic-workers: true
       grenade_localrc:
         BASE_RUN_SMOKE: False
+      grenade_devstack_localrc:
+        shared:
+          Q_AGENT: ovn
+          Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn
+          NEUTRON_DEPLOY_MOD_WSGI: True
       tox_envlist: all
       tempest_plugins:
         - designate-tempest-plugin
@@ -170,19 +181,28 @@
     parent: designate-grenade-common
     post-run: playbooks/designate-pdns4/post.yaml
     vars:
+      # Move this forward when master changes to a new skip-level-allowed
+      # target release. Right now, this is Dalmatian (2024.2) because master is
+      # Flamingo (2025.2).
+      # When master is G (2026.1), this should become Epoxy (2025.1),
+      # and so forth.
+      grenade_from_branch: stable/2024.2
       grenade_devstack_localrc:
         shared:
           DESIGNATE_BACKEND_DRIVER: pdns4
           DESIGNATE_SERVICE_PORT_DNS: 5322
-      grenade_from_branch: stable/2024.1
 
 - job:
     name: designate-grenade-bind9-skip-level
     parent: designate-grenade-common
     post-run: playbooks/designate-bind9/post.yaml
-    voting: false
     vars:
-      grenade_from_branch: stable/2024.1
+      # Move this forward when master changes to a new skip-level-allowed
+      # target release. Right now, this is Dalmatian (2024.2) because master is
+      # Flamingo (2025.2).
+      # When master is G (2026.1), this should become Epoxy (2025.1),
+      # and so forth.
+      grenade_from_branch: stable/2024.2
 
 - job:
     name: designate-tox-dnspython-latest

devstack/upgrade/from-2024.2/upgrade-designate

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+# Openstack moved from using wsgi scripts to directly calling the wsgi module
+# due to changes in setuptools that stops the pbr wsgi_scripts from working.
+# This script will reconfigure uwsgi on upgrade to point to the module instead
+# of the wsgi script that is no longer present in designate.
+
+function configure_designate_upgrade {
+    source $GRENADE_DIR/functions
+    source ${TARGET_DEVSTACK_DIR}/lib/apache
+
+    write_uwsgi_config "$DESIGNATE_UWSGI_CONF" "$DESIGNATE_UWSGI" "/dns" "" "designate-api-wsgi"
+    # Note: We must use HTTP transport here due to bug:
+    # https://github.com/unbit/uwsgi/issues/2368
+    wsgi_conf=$(apache_site_config_for designate-api-wsgi)
+    echo 'ProxyPass "/dns" "http://127.0.0.1:60053" retry=0' | sudo tee $wsgi_conf
+    iniset $DESIGNATE_UWSGI_CONF uwsgi http-socket 127.0.0.1:60053
+
+}

devstack/upgrade/upgrade.sh

@@ -76,6 +76,10 @@ if is_service_enabled q-svc; then
     restart_service devstack@q-svc.service
 fi
 
+if is_service_enabled neutron-api; then
+    restart_service devstack@neutron-api.service
+fi
+
 # calls upgrade-designate for specific release
 upgrade_project designate $RUN_DIR $BASE_DEVSTACK_BRANCH $TARGET_DEVSTACK_BRANCH