From f95a902df18eeca0740015a4c52d6fa91377901d Mon Sep 17 00:00:00 2001
From: Slawek Kaplonski <skaplons@redhat.com>
Date: Thu, 5 Nov 2020 09:35:12 +0100
Subject: [PATCH] Disable cinder services on neutron grenade jobs

We don't need it to test cinder in our jobs.
This patch disables Cinder in grenade jobs. If that will be ok
we can do the same for scenario jobs also.

This patch also enables br-ex-tcpdump and br-int-flows
services in the grenade jobs as it was missing there and
may be useful during debugging some failures of those jobs
in the future.

Conflicts:
    zuul.d/grenade.yaml

Change-Id: If490da1f7e695564a65cabf95f25c72f7639ae19
(cherry picked from commit ca3f2813c26fb8a14c0853a4d6b4679088f7fbec)
---
 zuul.d/grenade.yaml | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/zuul.d/grenade.yaml b/zuul.d/grenade.yaml
index 657259781e3..c6b06315708 100644
--- a/zuul.d/grenade.yaml
+++ b/zuul.d/grenade.yaml
@@ -18,12 +18,26 @@
       - ^migration/.*$
     vars:
       devstack_services:
-        c-bak: false
         etcd: false
+        br-ex-tcpdump: true
+        br-int-flows: true
+        # Cinder services
+        c-api: false
+        c-bak: false
+        c-sch: false
+        c-vol: false
+        cinder: false
+        # Swift services
         s-account: false
         s-container: false
         s-object: false
         s-proxy: false
+    group-vars:
+      subnode:
+        devstack_services:
+          # Cinder services
+          c-bak: false
+          c-vol: false
 
 - job:
     name: neutron-grenade-dvr-multinode
@@ -37,8 +51,16 @@
     irrelevant-files: *irrelevant-files
     vars:
       devstack_services:
-        c-bak: false
         etcd: false
+        br-ex-tcpdump: true
+        br-int-flows: true
+        # Cinder services
+        c-api: false
+        c-bak: false
+        c-sch: false
+        c-vol: false
+        cinder: false
+        # Swift services
         s-account: false
         s-container: false
         s-object: false
@@ -76,6 +98,9 @@
           q-agt: true
           q-l3: true
           q-meta: true
+          # Cinder services
+          c-bak: false
+          c-vol: false
         devstack_local_conf:
           post-config:
             $NEUTRON_CONF: