From: Mike Perez <thingee@gmail.com>
Date: Thu, 26 Feb 2015 20:07:22 +0000 (-0800)
Subject: Update v1 deprecation warnings
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=08aa1cbbb6cfd1f1bc9fe7ac2bc9d26cd9fdcd02;p=openstack-build%2Fcinder-build.git

Update v1 deprecation warnings

As discussed on IRC and mailing lists, we're going to give more time for
deprecation of the v1 API. Since we introduced the deprecation of the v1
API in Juno, we can remove it after EOL of Juno, which will be the
release of Liberty.

Change-Id: I2d6013717d84f98a20ed64b4ebf09bac6bb0843e
---

diff --git a/cinder/api/__init__.py b/cinder/api/__init__.py
index 4112d598c..bf2ac7eb6 100644
--- a/cinder/api/__init__.py
+++ b/cinder/api/__init__.py
@@ -28,8 +28,8 @@ LOG = logging.getLogger(__name__)
 
 def root_app_factory(loader, global_conf, **local_conf):
     if CONF.enable_v1_api:
-        LOG.warn(_LW('The v1 api is deprecated and will be removed after the '
-                     'Juno release. You should set enable_v1_api=false and '
+        LOG.warn(_LW('The v1 api is deprecated and will be removed in the '
+                     'Liberty release. You should set enable_v1_api=false and '
                      'enable_v2_api=true in your cinder.conf file.'))
     else:
         del local_conf['/v1']