From 982fba9151064fddba59ab571f81bbe00113bf24 Mon Sep 17 00:00:00 2001
From: Slawek Kaplonski <skaplons@redhat.com>
Date: Fri, 8 Mar 2019 14:49:05 +0100
Subject: [PATCH] Use openstack-three-node-bionic nodeset in tobiko devstack
 job

Nodeset openstack-three-node-bionic defined in devstack repo, in [1]
is the same as was defined in tobiko repository.
So lets reuse common template in tobiko.

[1] https://github.com/openstack-dev/devstack/blob/16eea25b2645260808c7d063a8308cac6cc68cef/.zuul.yaml#L152

Change-Id: I3637dbdc780aa1ec2bf9a8a71731ba66d28af4cd
---
 zuul.d/nodes.yaml           | 33 ---------------------------------
 zuul.d/tobiko-devstack.yaml |  9 ++++++++-
 2 files changed, 8 insertions(+), 34 deletions(-)
 delete mode 100644 zuul.d/nodes.yaml

diff --git a/zuul.d/nodes.yaml b/zuul.d/nodes.yaml
deleted file mode 100644
index 4a785cb0c..000000000
--- a/zuul.d/nodes.yaml
+++ /dev/null
@@ -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
diff --git a/zuul.d/tobiko-devstack.yaml b/zuul.d/tobiko-devstack.yaml
index 212d32574..25a7f8185 100644
--- a/zuul.d/tobiko-devstack.yaml
+++ b/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.