Browse code

Merge "Default to Cinder REST API v2"

Jenkins authored on 2013/11/23 08:58:25
Showing 1 changed files
... ...
@@ -81,3 +81,8 @@ export OS_CACERT=$INT_CA_DIR/ca-chain.pem
81 81
 export NOVA_VERSION=${NOVA_VERSION:-1.1}
82 82
 # In the future this will change names:
83 83
 export COMPUTE_API_VERSION=${COMPUTE_API_VERSION:-$NOVA_VERSION}
84
+
85
+# Currently cinderclient needs you to specify the *volume api* version. This
86
+# needs to match the config of your catalog returned by Keystone.
87
+export CINDER_VERSION=${CINDER_VERSION:-2}
88
+export OS_VOLUME_API_VERSION=${OS_VOLUME_API_VERSION:-$CINDER_VERSION}