From f64f43b533b5bd3ef58b25bdabecd6789c6172ad Mon Sep 17 00:00:00 2001
From: Mike Perez <thingee@gmail.com>
Date: Wed, 25 Jun 2014 08:51:31 -0700
Subject: [PATCH] Default cinder enable_v1_api to true

As of Juno, Cinder will be deprecating the Cinder V1 API and setting it
to not be enabled by default. We'll make it enabled in devstack to
continue tests while it's supported.

Change-Id: Ia09eed0375a73c69a29b1aa379b5bd9fd3a1f5b7
---
 lib/cinder | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/cinder b/lib/cinder
index 40a8418f6f..6f2d7c6bec 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -269,6 +269,10 @@ function configure_cinder {
     iniset $CINDER_CONF DEFAULT state_path $CINDER_STATE_PATH
     iniset $CINDER_CONF DEFAULT 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
 
     if is_service_enabled swift; then
         iniset $CINDER_CONF DEFAULT backup_swift_url "http://$SERVICE_HOST:8080/v1/AUTH_"