[Grenade] Explicitly enable correct neutron services in devstack config

It seems that when neutron is enabed in the Devstack's services as
"enable_service q-svc" it may be started properly by Devstack but when
it comes to stopping it, it tries to stop services expected to be
enabled when it is deployed under mod_wsgi and that fails.

So this patch enables correct services in the devstack's configuration
so that those services can be started properly.

Depends-On: https://review.opendev.org/c/openstack/devstack/+/940438
Depends-On: https://review.opendev.org/c/openstack/devstack/+/940447
Depends-On: https://review.opendev.org/c/openstack/grenade/+/940579

Closes-bug: #2096912
Change-Id: Ia077097c11a1ccc9e03d5e4ceed068790c5e8758

zuul.d/grenade.yaml

@@ -56,7 +56,10 @@
         q-dhcp: true
         q-l3: true
         q-meta: true
-        q-svc: true
+        q-svc: false
+        neutron-api: true
+        neutron-rpc-server: true
+        neutron-periodic-workers: true
         q-metering: true
         ovn-controller: false
         ovn-northd: false
@@ -133,7 +136,10 @@
         q-dhcp: true
         q-l3: true
         q-meta: true
-        q-svc: true
+        q-svc: false
+        neutron-api: true
+        neutron-rpc-server: true
+        neutron-periodic-workers: true
         q-metering: true
         ovn-controller: false
         ovn-northd: false
@@ -316,7 +322,11 @@
         ovsdb-server: true
         placement-api: true
         peakmem_tracker: false
-        q-svc: true
+        q-svc: false
+        neutron-api: true
+        neutron-ovn-maintenance-worker: true
+        neutron-rpc-server: false
+        neutron-periodic-workers: true
         q-agt: false
         q-dhcp: false
         q-l3: false
@@ -396,6 +406,13 @@
       grenade_devstack_localrc:
         shared:
           NEUTRON_DEPLOY_MOD_WSGI: False
+      devstack_services:
+        # Neutron services
+        q-svc: true
+        neutron-api: false
+        neutron-rpc-server: false
+        neutron-periodic-workers: false
+        neutron-ovn-maintenance-worker: false
 
 - job:
     name: neutron-ovn-grenade-multinode-skip-level
@@ -415,3 +432,9 @@
       grenade_devstack_localrc:
         shared:
           NEUTRON_DEPLOY_MOD_WSGI: False
+      devstack_services:
+        q-svc: true
+        neutron-api: false
+        neutron-rpc-server: false
+        neutron-periodic-workers: false
+        neutron-ovn-maintenance-worker: false