From bd8ac01b02cafba7cfd98364c8f3009c19042da4 Mon Sep 17 00:00:00 2001
From: Mike Perez <thingee@gmail.com>
Date: Tue, 20 Aug 2013 21:53:30 -0700
Subject: [PATCH] Default to Cinder REST API v2

Set OS_VOLUME_API_VERSION environment variable to 2 so we use
specifically Cinder REST API v2. v1 is still enabled in the catalog, but
we want more exposure to v2 for testing.

Change-Id: I6c2f29edf44a0f58a7830fe4dd2db35f2db3658c
---
 openrc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/openrc b/openrc
index 3de7e3958f..d5b215603a 100644
--- a/openrc
+++ b/openrc
@@ -81,3 +81,8 @@ export OS_CACERT=$INT_CA_DIR/ca-chain.pem
 export NOVA_VERSION=${NOVA_VERSION:-1.1}
 # In the future this will change names:
 export COMPUTE_API_VERSION=${COMPUTE_API_VERSION:-$NOVA_VERSION}
+
+# Currently cinderclient needs you to specify the *volume api* version. This
+# needs to match the config of your catalog returned by Keystone.
+export CINDER_VERSION=${CINDER_VERSION:-2}
+export OS_VOLUME_API_VERSION=${OS_VOLUME_API_VERSION:-$CINDER_VERSION}