From 7578ad2df2e150b274ccb61a871f33cc729dab95 Mon Sep 17 00:00:00 2001
From: Thomas Bechtold <tbechtold@suse.com>
Date: Mon, 22 Aug 2016 07:50:29 +0200
Subject: [PATCH] Remove enable_v1_api and enable_v2_api config opts

Both options are not used in the code and the help text already
mentioned that the variables will be removed.

Change-Id: I4b90080dde789b772323e1d93d5a08c4d9f342f5
---
 manila/api/__init__.py  | 14 --------------
 manila/common/config.py | 10 ----------
 2 files changed, 24 deletions(-)

diff --git a/manila/api/__init__.py b/manila/api/__init__.py
index be4902009d..d91f63aa41 100644
--- a/manila/api/__init__.py
+++ b/manila/api/__init__.py
@@ -14,22 +14,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
-from oslo_log import log
 import paste.urlmap
 
-from manila.i18n import _LW
-
-
-LOG = log.getLogger(__name__)
-CONF = cfg.CONF
-
 
 def root_app_factory(loader, global_conf, **local_conf):
-    if CONF.enable_v1_api:
-        LOG.warning(_LW('The config option enable_v1_api is deprecated, is '
-                        'not used, and will be removed in a future release.'))
-    if CONF.enable_v2_api:
-        LOG.warning(_LW('The config option enable_v2_api is deprecated, is '
-                        'not used, and will be removed in a future release.'))
     return paste.urlmap.urlmap_factory(loader, global_conf, **local_conf)
diff --git a/manila/common/config.py b/manila/common/config.py
index f8ab91f3ec..130a276d4a 100644
--- a/manila/common/config.py
+++ b/manila/common/config.py
@@ -71,16 +71,6 @@ global_opts = [
     cfg.StrOpt('data_topic',
                default='manila-data',
                help='The topic data nodes listen on.'),
-    cfg.BoolOpt('enable_v1_api',
-                default=False,
-                help=_('Deploy v1 of the Manila API. This option is '
-                       'deprecated, is not used, and will be removed '
-                       'in a future release.')),
-    cfg.BoolOpt('enable_v2_api',
-                default=False,
-                help=_('Deploy v2 of the Manila API. This option is '
-                       'deprecated, is not used, and will be removed '
-                       'in a future release.')),
     cfg.BoolOpt('api_rate_limit',
                 default=True,
                 help='Whether to rate limit the API.'),