Fix neutron job

+ temporary mark cinder job as non-voting

Change-Id: Ia5f965e81f903178c24e2ba00bbf8b89fb4be8b8

.zuul.d/rally-task-neutron.yaml

@@ -3,4 +3,33 @@
     parent: rally-task-at-devstack
     vars:
       rally_task: rally-jobs/neutron.yaml
-
+      devstack_localrc:
+        Q_ML2_TENANT_NETWORK_TYPE: vxlan
+        Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge
+        Q_AGENT: openvswitch
+      devstack_services:
+        neutron-trunk: true
+        # Cinder services
+        c-api: true
+        c-bak: true
+        c-sch: true
+        c-vol: true
+        cinder: true
+        # Swift services
+        s-account: false
+        s-container: false
+        s-object: false
+        s-proxy: false
+        # OVN services
+        ovn-controller: false
+        ovn-northd: false
+        ovs-vswitchd: false
+        ovsdb-server: false
+        q-ovn-metadata-agent: false
+        # Neutron services
+        q-agt: true
+        q-dhcp: true
+        q-l3: true
+        q-meta: true
+        q-metering: true
+        q-svc: true

.zuul.d/zuul.yaml

@@ -19,7 +19,8 @@
               - rally_openstack/task/cleanup/resources.py
               - rally_openstack/task/scenarios/barbican
               - tests/ci/playbooks
-        - rally-task-cinder
+        - rally-task-cinder:
+            voting: false
         - rally-task-designate:
             files:
               - .zuul.d/zuul.yaml
@@ -78,7 +79,8 @@
             # watcher-api did not start last time
             voting: false
         - rally-task-zaqar
-        - rally-verify-tempest
+        - rally-verify-tempest:
+            voting: false
     gate:
       jobs:
         - rally-tox-cover
@@ -99,7 +101,6 @@
               - rally_openstack/task/cleanup/resources.py
               - rally_openstack/task/scenarios/barbican
               - tests/ci/playbooks
-        - rally-task-cinder
         #- rally-task-heat
         - rally-task-ironic
         - rally-task-keystone-glance-swift
@@ -116,7 +117,6 @@
               - rally_openstack/task/scenarios/neutron/network.py
               - tests/ci/playbooks
         - rally-task-zaqar
-        - rally-verify-tempest
     post:
       jobs:
         - rally-openstack-docker-build-and-push: