From 3db815957324f4bd6912238a960a90624d97c518 Mon Sep 17 00:00:00 2001
From: Eric Fried <efried@us.ibm.com>
Date: Tue, 27 Mar 2018 17:45:24 -0500
Subject: [PATCH] Remove deprecated [placement] opts

[placement]os_region_name has been deprecated in favor of
[placement]region_name [1], and other usages removed [2].

[placement]os_interfaces has been deprecated in favor of
[placement]valid_interfaces.

This change removes the deprecated options, for the requisite time hath
elapsed.

[1] https://review.openstack.org/#/c/492247/
[2] Iea7d5d0d6907adbcb236dc43b5af7469de2ba78b

Change-Id: Ide57fecf92a22c13884b872b3007e77a059e8b08
---
 nova/conf/placement.py                        | 39 +------------------
 nova/tests/unit/cmd/test_status.py            |  2 -
 ...cated-placement-opts-aeffb090a2e94bdc.yaml | 11 ++++++
 3 files changed, 13 insertions(+), 39 deletions(-)
 create mode 100644 releasenotes/notes/remove-deprecated-placement-opts-aeffb090a2e94bdc.yaml

diff --git a/nova/conf/placement.py b/nova/conf/placement.py
index e5f627cbdb18..9dd545915585 100644
--- a/nova/conf/placement.py
+++ b/nova/conf/placement.py
@@ -24,32 +24,6 @@ placement_group = cfg.OptGroup(
     help="Configuration options for connecting to the placement API service")
 
 placement_opts = [
-    cfg.StrOpt(
-        'os_region_name',
-        deprecated_for_removal=True,
-        deprecated_since='17.0.0',
-        deprecated_reason='Endpoint lookup uses the service catalog via '
-                          'common keystoneauth1 Adapter configuration '
-                          'options.  Use the region_name option instead.',
-        help="""
-Region name of this node. This is used when picking the URL in the service
-catalog.
-
-Possible values:
-
-* Any string representing region name
-"""),
-    cfg.StrOpt(
-        'os_interface',
-        deprecated_for_removal=True,
-        deprecated_since='17.0.0',
-        deprecated_reason='Endpoint lookup uses the service catalog via '
-                          'common keystoneauth1 Adapter configuration '
-                          'options.  Use the valid_interfaces option instead.',
-        help="""
-Endpoint interface for this node. This is used when picking the URL in the
-service catalog.
-"""),
     cfg.BoolOpt(
         'randomize_allocation_candidates',
         default=False,
@@ -63,19 +37,11 @@ is determined.
 """),
 ]
 
-deprecated_opts = {
-    'region_name': [cfg.DeprecatedOpt('os_region_name',
-                                      group=placement_group.name)],
-    'valid_interfaces': [cfg.DeprecatedOpt('os_interface',
-                                           group=placement_group.name)]
-}
-
 
 def register_opts(conf):
     conf.register_group(placement_group)
     conf.register_opts(placement_opts, group=placement_group)
-    confutils.register_ksa_opts(conf, placement_group, DEFAULT_SERVICE_TYPE,
-                                deprecated_opts=deprecated_opts)
+    confutils.register_ksa_opts(conf, placement_group, DEFAULT_SERVICE_TYPE)
 
 
 def list_opts():
@@ -87,6 +53,5 @@ def list_opts():
             ks_loading.get_auth_plugin_conf_options('password') +
             ks_loading.get_auth_plugin_conf_options('v2password') +
             ks_loading.get_auth_plugin_conf_options('v3password') +
-            confutils.get_ksa_adapter_opts(DEFAULT_SERVICE_TYPE,
-                                           deprecated_opts=deprecated_opts))
+            confutils.get_ksa_adapter_opts(DEFAULT_SERVICE_TYPE))
     }
diff --git a/nova/tests/unit/cmd/test_status.py b/nova/tests/unit/cmd/test_status.py
index 367a72663a13..b547c7b62be3 100644
--- a/nova/tests/unit/cmd/test_status.py
+++ b/nova/tests/unit/cmd/test_status.py
@@ -147,8 +147,6 @@ class TestPlacementCheck(test.NoDBTestCase):
 
     def test_placement_get_interface_internal(self):
         """Tests that "internal" is specified for interface when configured."""
-        # TODO(efried): Test that the deprecated opts (e.g. os_interface) still
-        #               work once bug #1709728 is resolved.
         self.flags(valid_interfaces='internal', group='placement')
         self._test_placement_get_interface(['internal'])
 
diff --git a/releasenotes/notes/remove-deprecated-placement-opts-aeffb090a2e94bdc.yaml b/releasenotes/notes/remove-deprecated-placement-opts-aeffb090a2e94bdc.yaml
new file mode 100644
index 000000000000..d619e750ed2f
--- /dev/null
+++ b/releasenotes/notes/remove-deprecated-placement-opts-aeffb090a2e94bdc.yaml
@@ -0,0 +1,11 @@
+---
+upgrade:
+  - |
+    The following deprecated options have been removed from the ``placement``
+    group of ``nova.conf``:
+
+    - ``os_region_name`` (use ``region_name`` instead)
+    - ``os_interface`` (use ``valid_interfaces`` instead)
+
+    These were deprecated in 17.0.0 as they have been superseded by their
+    respective keystoneauth1 Adapter configuration options.
\ No newline at end of file