remove the ability to disable v2.1

The option to enable (and thus possibly disable) v2.1 was deprecated
in Mitaka. It should now be removed. v2.1 is a required part of the
API and it was default on.

Change-Id: Ia446040e3b4e87438712e7d8c1bafda0a6e53999

nova/api/openstack/__init__.py

@@ -41,11 +41,6 @@ from nova import wsgi as base_wsgi
 
 
 api_opts = [
-        cfg.BoolOpt('enabled',
-                    default=True,
-                    help='DEPRECATED: Whether the V2.1 API is enabled or not. '
-                    'This option will be removed in the near future.',
-                    deprecated_for_removal=True, deprecated_group='osapi_v21'),
         cfg.ListOpt('extensions_blacklist',
                     default=[],
                     help='DEPRECATED: A list of v2.1 API extensions to never '
@@ -367,11 +362,6 @@ class APIRouterV21(base_wsgi.Router):
                         return self._register_extension(ext)
             return False
 
-        if not CONF.osapi_v21.enabled:
-            LOG.info(_LI("V2.1 API has been disabled by configuration"))
-            LOG.warning(_LW("In the M release you must run the v2.1 API."))
-            return
-
         if (CONF.osapi_v21.extensions_blacklist or
                 CONF.osapi_v21.extensions_whitelist):
             LOG.warning(

nova/api/openstack/compute/versions.py

@@ -21,7 +21,6 @@ from nova.api.openstack import wsgi
 
 
 CONF = cfg.CONF
-CONF.import_opt('enabled', 'nova.api.openstack', group='osapi_v21')
 
 LINKS = {
    'v2.0': {
@@ -80,8 +79,6 @@ VERSIONS = {
 class Versions(wsgi.Resource):
     def __init__(self):
         super(Versions, self).__init__(None)
-        if not CONF.osapi_v21.enabled:
-            del VERSIONS["v2.1"]
 
     def index(self, req, body=None):
         """Return all versions."""

nova/test.py

@@ -56,7 +56,6 @@ from nova import utils
 
 
 CONF = cfg.CONF
-CONF.import_opt('enabled', 'nova.api.openstack', group='osapi_v21')
 
 logging.register_options(CONF)
 CONF.set_override('use_stderr', False)

nova/tests/unit/conf_fixture.py

@@ -60,7 +60,6 @@ class ConfFixture(config_fixture.Config):
         self.conf.set_default('sqlite_synchronous', False,
                 group='api_database')
         self.conf.set_default('fatal_exception_format_errors', True)
-        self.conf.set_default('enabled', True, 'osapi_v21')
         # TODO(sdague): this makes our project_id match 'fake' as well.
         # We should fix the tests to use real
         # UUIDs then drop this work around.

releasenotes/notes/v21enable-8454d6eca3ec604f.yaml

@@ -0,0 +1,6 @@
+---
+upgrade:
+
+  - The deprecated osapi_v21.enabled config option has been removed. This
+    previously allowed you a way to disable the v2.1 API. That is no
+    longer something we support, v2.1 is mandatory.