From 357dff588ef63935a2a36e89b1aa96419ef09ece Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Fri, 11 Dec 2015 13:51:24 -0600 Subject: [PATCH] Remove Cinder API version cap Cinder API was pinned to v1 due to openstackclient missing some of the v2 commands, as reported in osc bug 1475060. That bug has since been marked invalid, but its intent was covered by the blueprint: https://blueprints.launchpad.net/python-openstackclient/+spec/volume-v2 This removes the pinning to the v1 API now that osc supports v2. Also removing the enablement of v1 as it was deprecated three releases ago and we would like to get more coverage on v2. Change-Id: Ia4d97734738d026c8721791669110778ff5eb6e5 --- lib/cinder | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/cinder b/lib/cinder index 2119858253..569f3ab0a3 100644 --- a/lib/cinder +++ b/lib/cinder @@ -270,10 +270,6 @@ function configure_cinder { iniset $CINDER_CONF DEFAULT state_path $CINDER_STATE_PATH iniset $CINDER_CONF oslo_concurrency lock_path $CINDER_STATE_PATH iniset $CINDER_CONF DEFAULT periodic_interval $CINDER_PERIODIC_INTERVAL - # NOTE(thingee): Cinder V1 API is deprecated and defaults to off as of - # Juno. Keep it enabled so we can continue testing while it's still - # supported. - iniset $CINDER_CONF DEFAULT enable_v1_api true iniset $CINDER_CONF DEFAULT os_region_name "$REGION_NAME" @@ -550,9 +546,7 @@ function create_volume_types { local be be_name for be in ${CINDER_ENABLED_BACKENDS//,/ }; do be_name=${be##*:} - # 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} + openstack volume type create --property volume_backend_name="${be_name}" ${be_name} done fi }