From 9dc2583e87d8443bbe2250bd560b50da197f56fc Mon Sep 17 00:00:00 2001
From: Sean Dague <sean@dague.net>
Date: Mon, 13 Jul 2015 14:10:29 -0400
Subject: [PATCH] remove neutron advanced services from grenade

As the neutron splitout happens neutron advanced services should
actually be tested by grenade plugins instead. This decouples the
neutron advanced services from grenade so they can work on their own
upgrade mechanisms.

Change-Id: Iec8393660543e01f79a468142d9d7b5367c72af4
---
 features.yaml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/features.yaml b/features.yaml
index b15083d7..fa9f0d03 100644
--- a/features.yaml
+++ b/features.yaml
@@ -9,13 +9,13 @@ config:
     # and don't need to incur the overhead of installing all services in the process.
     no_services: [default]
   neutron:
-    features: [neutron]
+    features: [neutron, neutron-adv]
   # different backends
   postgres:
     features: [postgresql]
   # feature changes for different test matrixes
   grenade:
-    rm-features: [trove, sahara]
+    rm-features: [trove, sahara, neutron-adv]
   tempest:
     features: [tempest]
   # feature changes for different configs of existing services
@@ -88,7 +88,12 @@ features:
 
   neutron:
     base:
-      services: [quantum, q-svc, q-agt, q-dhcp, q-l3, q-meta, q-lbaas, q-fwaas, q-metering]
+      services: [quantum, q-svc, q-agt, q-dhcp, q-l3, q-meta, q-metering]
+      rm-services: [n-net]
+
+  neutron-adv:
+    base:
+      services: [q-lbaas, q-fwaas]
       rm-services: [n-net]
 
   swift: