From e5a09da30cb567cfe0652126ff18f16935314def Mon Sep 17 00:00:00 2001
From: Matthew Treinish <mtreinish@kortar.org>
Date: Mon, 23 Jun 2014 09:40:49 -0400
Subject: [PATCH] Fix typo in DEVSTACK_GATE_TEMPEST_NOVA_V3_API

This commit fixes a small oversight in setting the nova v3 api tempest
tests. When this env variable was added to set whether the testing was
enabled the check used a different variable name than the wrap script.
Also neither of these variables matched what was being set by jenkins,
this meant that the v3 api tests would never be enabled. This fixes
that by ensuring the variables are the same and matches the variable
set in the JJB template for the v3 api jobs.

Change-Id: I54925a468c4dc7eb9390a78d509b9385caa587d4
---
 devstack-vm-gate-wrap.sh | 2 +-
 devstack-vm-gate.sh      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index 78cc4419..3cd6a827 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -193,7 +193,7 @@ export DEVSTACK_GATE_KEYSTONE_V3=${DEVSTACK_GATE_KEYSTONE_V3:-0}
 export DEVSTACK_GATE_USE_APACHE=${DEVSTACK_GATE_USE_APACHE:-0}
 
 # Set to 1 to enable the Nova v3 API tests
-export DEVSTACK_GATE_TEMPEST_NOVA_API_v3=${DEVSTACK_GATE_TEMPEST_NOVA_API_v3:-0}
+export DEVSTACK_GATE_TEMPEST_NOVA_V3_API=${DEVSTACK_GATE_TEMPEST_NOVA_V3_API:-0}
 
 # Set the number of threads to run tempest with
 DEFAULT_CONCURRENCY=$(nproc)
diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index 4e520163..2649d715 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -227,7 +227,7 @@ EOF
         # by default.
         echo "APACHE_ENABLED_SERVICES=" >> localrc
     fi
-    if [ "$DEVSTACK_GATE_TEMPEST_NOVA_V3" -eq "1" ]; then
+    if [ "$DEVSTACK_GATE_TEMPEST_NOVA_V3_API" -eq "1" ]; then
         echo "TEMPEST_NOVA_API_V3=True" >> localrc
     fi
 }