openstack/cinder
Code Issues Proposed changes

Merge "Remove deprecated osapi_volume_base_URL"

Browse Source
This commit is contained in:
Jenkins 2017-10-05 01:18:29 +00:00 committed by Gerrit Code Review
commit 70fcad3739
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cinder/api/common.py
View File

@ -37,12 +37,6 @@ api_common_opts = [
default=1000, default=1000,
help='The maximum number of items that a collection ' help='The maximum number of items that a collection '
'resource returns in a single response'), 'resource returns in a single response'),
cfg.StrOpt('osapi_volume_base_URL',
help='DEPRECATED: Base URL that will be presented to users in '
'links to the OpenStack Volume API',
deprecated_name='osapi_compute_link_prefix',
deprecated_since='Pike',
deprecated_reason='Duplicate config option.'),
cfg.StrOpt('resource_query_filters_file', cfg.StrOpt('resource_query_filters_file',
default='/etc/cinder/resource_filters.json', default='/etc/cinder/resource_filters.json',
help="Json file indicating user visible filter " help="Json file indicating user visible filter "

3
cinder/api/views/versions.py
View File

@ -27,8 +27,7 @@ versions_opts = [
"is None, which will use the request's host_url " "is None, which will use the request's host_url "
"attribute to populate the URL base. If Cinder is " "attribute to populate the URL base. If Cinder is "
"operating behind a proxy, you will want to change " "operating behind a proxy, you will want to change "
"this to represent the proxy's URL.", "this to represent the proxy's URL."),
deprecated_name='osapi_volume_base_URL'),
] ]
CONF = cfg.CONF CONF = cfg.CONF

6
releasenotes/notes/remove_osapi_volume_base_url-33fed24c4ad1b2b6.yaml Normal file
View File

@ -0,0 +1,6 @@
---
upgrade:
- |
The `osapi_volume_base_URL` config option was deprecated in Pike and has
now been removed. The `public_endpoint` config option should be used
instead.