Browse code

Merge "Default cinder enable_v1_api to true"

Jenkins authored on 2014/06/28 21:46:32
Showing 1 changed files
... ...
@@ -269,6 +269,10 @@ function configure_cinder {
269 269
     iniset $CINDER_CONF DEFAULT state_path $CINDER_STATE_PATH
270 270
     iniset $CINDER_CONF DEFAULT lock_path $CINDER_STATE_PATH
271 271
     iniset $CINDER_CONF DEFAULT periodic_interval $CINDER_PERIODIC_INTERVAL
272
+    # NOTE(thingee): Cinder V1 API is deprecated and defaults to off as of
273
+    # Juno. Keep it enabled so we can continue testing while it's still
274
+    # supported.
275
+    iniset $CINDER_CONF DEFAULT enable_v1_api true
272 276
 
273 277
     if is_service_enabled swift; then
274 278
         iniset $CINDER_CONF DEFAULT backup_swift_url "http://$SERVICE_HOST:8080/v1/AUTH_"