From bd14d078098eb2055c0dae784de892b0b1346ed5 Mon Sep 17 00:00:00 2001
From: Steve Martinelli <stevemar@ca.ibm.com>
Date: Thu, 8 Oct 2015 02:10:39 -0400
Subject: [PATCH] unwedge the gate

devstack defaults to v3 and makes some janky assumptions in
the generated rc files

Change-Id: I4b0b3eb6ab2aa9be2ac4c2404b2f9655e3ed564e
---
 functional/tests/volume/v1/test_volume.py | 2 ++
 post_test_hook.sh                         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/functional/tests/volume/v1/test_volume.py b/functional/tests/volume/v1/test_volume.py
index 596b8217f3..874be6e115 100644
--- a/functional/tests/volume/v1/test_volume.py
+++ b/functional/tests/volume/v1/test_volume.py
@@ -10,6 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import os
 import uuid
 
 from functional.tests.volume.v1 import common
@@ -25,6 +26,7 @@ class VolumeTests(common.BaseVolumeTests):
 
     @classmethod
     def setUpClass(cls):
+        os.environ['OS_VOLUME_API_VERSION'] = '1'
         opts = cls.get_show_opts(cls.FIELDS)
         raw_output = cls.openstack('volume create --size 1 ' + cls.NAME + opts)
         expected = cls.NAME + '\n'
diff --git a/post_test_hook.sh b/post_test_hook.sh
index 4c35b52099..7bb036f9cf 100755
--- a/post_test_hook.sh
+++ b/post_test_hook.sh
@@ -12,7 +12,7 @@ OPENSTACKCLIENT_DIR=$(cd $(dirname "$0") && pwd)
 
 echo "Running openstackclient functional test suite"
 sudo -H -u stack -i <<!
-source ~stack/devstack/accrc/admin/admin
+source ~stack/devstack/openrc admin admin
 echo 'Running tests with:'
 env | grep OS_
 cd ${OPENSTACKCLIENT_DIR}