From 86c144412183d3a9b352f3c5dd6ed6a21012b542 Mon Sep 17 00:00:00 2001
From: "John L. Villalovos" <john.l.villalovos@intel.com>
Date: Sat, 17 Dec 2016 19:03:25 -0800
Subject: [PATCH] Fix DVR gate job breakage

The Neutron DVR gate jobs are broken due to commit
7fac6b68380f3f0ce44eefd257e571844a8b741d. Add an empty 'neutron-dvr'
entry in the 'primary' section of features.yaml

Also add logging on what the features have been set to.

Change-Id: I7f57de5d43f6943863b1df3e2c367587b519fc05
---
 devstack-vm-gate.sh | 2 ++
 features.yaml       | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index a8726ccd..0c28b2a1 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -263,6 +263,8 @@ function setup_localrc {
 
         MY_ENABLED_SERVICES=$(cd $BASE/new/devstack-gate && ./test-matrix.py -b $branch_for_matrix -f $DEVSTACK_GATE_FEATURE_MATRIX -r $test_matrix_role)
         local original_enabled_services=$(cd $BASE/new/devstack-gate && ./test-matrix.py -b $branch_for_matrix -f $DEVSTACK_GATE_FEATURE_MATRIX -r primary)
+        echo "MY_ENABLED_SERVICES: ${MY_ENABLED_SERVICES}"
+        echo "original_enabled_services: ${original_enabled_services}"
 
         # Allow optional injection of ENABLED_SERVICES from the calling context
         if [[ ! -z $ENABLED_SERVICES ]] ; then
diff --git a/features.yaml b/features.yaml
index 467cf140..367617eb 100644
--- a/features.yaml
+++ b/features.yaml
@@ -110,6 +110,10 @@ primary:
     kilo:
       services: [q-vpn]
 
+  neutron-dvr:
+    base:
+      services: []
+
   swift:
     base:
       services: [s-proxy, s-account, s-container, s-object]