From efc9016055b81872eb548f2a61b55d651f912658 Mon Sep 17 00:00:00 2001
From: Sean McGinnis <sean.mcginnis@huawei.com>
Date: Tue, 3 Oct 2017 14:17:53 -0500
Subject: [PATCH] Remove deprecated osapi_volume_base_URL

This config option was basically the same as public_endpoint and was
deprecated in Pike in favor of using that option instead. This now
removes it completely.

Change-Id: I405a404add187ba62357e541dfa1e8b39703ba18
---
 cinder/api/common.py                                        | 6 ------
 cinder/api/views/versions.py                                | 3 +--
 .../remove_osapi_volume_base_url-33fed24c4ad1b2b6.yaml      | 6 ++++++
 3 files changed, 7 insertions(+), 8 deletions(-)
 create mode 100644 releasenotes/notes/remove_osapi_volume_base_url-33fed24c4ad1b2b6.yaml

diff --git a/cinder/api/common.py b/cinder/api/common.py
index 5cbab7530f2..d28c1834087 100644
--- a/cinder/api/common.py
+++ b/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 "
diff --git a/cinder/api/views/versions.py b/cinder/api/views/versions.py
index e88b8d48829..a86d09a8a20 100644
--- a/cinder/api/views/versions.py
+++ b/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
diff --git a/releasenotes/notes/remove_osapi_volume_base_url-33fed24c4ad1b2b6.yaml b/releasenotes/notes/remove_osapi_volume_base_url-33fed24c4ad1b2b6.yaml
new file mode 100644
index 00000000000..41c3c922868
--- /dev/null
+++ b/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.