Merge "Remove deprecated osapi_volume_base_URL"

cinder/api/common.py

@@ -37,12 +37,6 @@ api_common_opts = [
                default=1000,
                help='The maximum number of items that a collection '
                     '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',
                default='/etc/cinder/resource_filters.json',
                help="Json file indicating user visible filter "

cinder/api/views/versions.py

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

releasenotes/notes/remove_osapi_volume_base_url-33fed24c4ad1b2b6.yaml

@@ -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.