commit 53e01600d9d44ebbbfde2256db90481d96d92a00
author Jenkins <jenkins@review.openstack.org> Fri Jul 17 11:03:45 2015 +0000
committer Gerrit Code Review <review@openstack.org> Fri Jul 17 11:03:45 2015 +0000
tree 9f86f83d759566c2bd5c4b1c3d732ccb7ef02b7c
parent f0e86a7ac75091c5ceeaeeb4f51869522f23e5f8
parent 7e5fb63b71364637eaa81a0f978af76fe3df2c97

Merge "Always use volume v1 API for type create."

lib/cinder

diff --git a/lib/cinder b/lib/cinder
index a9a9f0d..e5ed2db 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -485,7 +485,9 @@
         local be be_name
         for be in ${CINDER_ENABLED_BACKENDS//,/ }; do
             be_name=${be##*:}
-            openstack volume type create --property volume_backend_name="${be_name}" ${be_name}
+            # FIXME(jamielennox): Remove --os-volume-api-version pinning when
+            # osc supports volume type create on v2 api. bug #1475060
+            openstack volume type create --os-volume-api-version 1 --property volume_backend_name="${be_name}" ${be_name}
         done
     fi
 }