openstack/deb-glance
Code Issues Proposed changes

Remove unused enable_v3_api config option

Browse Source 
The option was used to enable experimental Artifacts API
that was moved to glance-glare service. This config option
does not do anything and is removed to avoid confusion.

Removed apropriate sections from example config files as well.

Change-Id: Ie84f3f65ec88fd30197758ac319ef5b2f4c313e2
Closes-bug: 1556050
This commit is contained in:
Erno Kuvaja 2016-03-11 12:00:55 +00:00
parent 36bba726fa
commit 9ef5ed125c
6 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etc/glance-api.conf
View File

@ -94,11 +94,6 @@
# Deploy the v2 OpenStack Images API. (boolean value)
#enable_v2_api = true
# Deploy the v3 OpenStack Objects API. (boolean value)
# This option is deprecated for removal.
# Its value may be silently ignored in the future.
#enable_v3_api = false
# Deploy the v1 OpenStack Registry API. (boolean value)
#enable_v1_registry = true

5
etc/glance-cache.conf
View File

@ -71,11 +71,6 @@
# Deploy the v2 OpenStack Images API. (boolean value)
#enable_v2_api = true
# Deploy the v3 OpenStack Objects API. (boolean value)
# This option is deprecated for removal.
# Its value may be silently ignored in the future.
#enable_v3_api = false
# Deploy the v1 OpenStack Registry API. (boolean value)
#enable_v1_registry = true

5
etc/glance-registry.conf
View File

@ -88,11 +88,6 @@
# Deploy the v2 OpenStack Images API. (boolean value)
#enable_v2_api = true
# Deploy the v3 OpenStack Objects API. (boolean value)
# This option is deprecated for removal.
# Its value may be silently ignored in the future.
#enable_v3_api = false
# Deploy the v1 OpenStack Registry API. (boolean value)
#enable_v1_registry = true

5
etc/glance-scrubber.conf
View File

@ -71,11 +71,6 @@
# Deploy the v2 OpenStack Images API. (boolean value)
#enable_v2_api = true
# Deploy the v3 OpenStack Objects API. (boolean value)
# This option is deprecated for removal.
# Its value may be silently ignored in the future.
#enable_v3_api = false
# Deploy the v1 OpenStack Registry API. (boolean value)
#enable_v1_registry = true

3
glance/api/middleware/version_negotiation.py
View File

@ -82,9 +82,6 @@ class VersionNegotiationFilter(wsgi.Middleware):
allowed_versions['v2.0'] = 2
allowed_versions['v2.1'] = 2
allowed_versions['v2.2'] = 2
if CONF.enable_v3_api:
allowed_versions['v3'] = 3
allowed_versions['v3.0'] = 3
return allowed_versions
def _match_version_string(self, subject):

3
glance/common/config.py
View File

@ -147,9 +147,6 @@ common_opts = [
help=_("Deploy the v1 OpenStack Images API.")),
cfg.BoolOpt('enable_v2_api', default=True,
help=_("Deploy the v2 OpenStack Images API.")),
cfg.BoolOpt('enable_v3_api', default=False,
help=_("Deploy the v3 OpenStack Objects API."),
deprecated_for_removal=True),
cfg.BoolOpt('enable_v1_registry', default=True,
help=_("Deploy the v1 OpenStack Registry API.")),
cfg.BoolOpt('enable_v2_registry', default=True,