From e13d249d948913981591a1b79fcb0a8331a4366f Mon Sep 17 00:00:00 2001
From: Eric Harney <eharney@redhat.com>
Date: Tue, 14 Jul 2015 11:49:36 -0400
Subject: [PATCH] Fix Cinder configuration for tempest-dsvm-full-lio

The intended Cinder settings aren't being applied,
causing this job to run tgtd instead of LIO.

Change-Id: Ic93350bdb2141f85b1d160535ccdd358e8ba90e4
---
 jenkins/jobs/devstack-gate.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml
index 7cbc11f2c9..f108d3664c 100644
--- a/jenkins/jobs/devstack-gate.yaml
+++ b/jenkins/jobs/devstack-gate.yaml
@@ -2118,8 +2118,8 @@
           export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_FULL=1
-          export CINDER_ISCSI_HELPER=lioadm
-          export CINDER_LVM_TYPE=thin
+          export DEVSTACK_LOCAL_CONFIG="CINDER_ISCSI_HELPER=lioadm"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"CINDER_LVM_TYPE=thin"
           export BRANCH_OVERRIDE={branch-override}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE