Merge "Use openstack-three-node-bionic nodeset in tobiko devstack job"

zuul.d/nodes.yaml

@@ -1,33 +0,0 @@
-- nodeset:
-    name: tobiko-multinode
-    nodes:
-      - name: controller
-        label: ubuntu-bionic
-      - name: compute1
-        label: ubuntu-bionic
-      - name: compute2
-        label: ubuntu-bionic
-    groups:
-      # Node where tests are executed and test results collected
-      - name: tempest
-        nodes:
-          - controller
-      # Nodes running the compute service
-      - name: compute
-        nodes:
-          - compute1
-          - compute2
-      # Nodes that are not the controller
-      - name: subnode
-        nodes:
-          - compute1
-          - compute2
-      # Switch node for multinode networking setup
-      - name: switch
-        nodes:
-          - controller
-      # Peer nodes for multinode networking setup
-      - name: peers
-        nodes:
-          - compute1
-          - compute2

zuul.d/tobiko-devstack.yaml

@@ -38,6 +38,13 @@
         tempest: false
         tls-proxy: true
       devstack_local_conf:
+        post-config:
+          $NEUTRON_CONF:
+            QUOTAS:
+              quota_router: 100
+              quota_floatingip: 500
+              quota_security_group: 100
+              quota_security_group_rule: 1000
         test-config:
           $TEMPEST_CONFIG:
             compute:
@@ -83,7 +90,7 @@
 - job:
     name: tobiko-devstack-multinode
     parent: tobiko-devstack
-    nodeset: tobiko-multinode
+    nodeset: openstack-three-node-bionic
     abstract: true
     description: |
       Base Tobiko devstack job with multinode.