Merge "Enable Neutron L3 agent on sub-nodes on upstream CI"

playbooks/multinode-devstack-pre-run.yaml

@@ -0,0 +1,3 @@
+- hosts: all
+  roles:
+    - multi-node-setup

tobiko/tests/scenario/neutron/test_network.py

@@ -117,7 +117,7 @@ class L3haSameHostNetworkTest(SameHostNetworkTest):
 @neutron.skip_if_missing_networking_extensions('l3-ha')
 @neutron.skip_if_missing_networking_agents(binary='neutron-l3-agent',
                                            count=2)
-class L3haDifferentHostNetworkTest(SameHostNetworkTest):
+class L3haDifferentHostNetworkTest(DifferentHostNetworkTest):
     #: Resources stack with Nova server to send messages to
     stack = tobiko.required_setup_fixture(
         stacks.L3haDifferentHostServerStackFixture)

zuul.d/tobiko-devstack.yaml

@@ -132,6 +132,9 @@
     abstract: true
     description: |
       Base Tobiko devstack job with multinode.
+    roles:
+      - zuul: openstack/neutron-tempest-plugin
+    pre-run: playbooks/multinode-devstack-pre-run.yaml
     vars:
       topology: multinode
       devstack_localrc:
@@ -154,6 +157,8 @@
           neutron-agent: true
           peakmem_tracker: true
           q-agt: true
+          q-l3: true
+          q-meta: true
           tls-proxy: false