From 6b0f82192b23b44b25c8d99913404c900c6f29f6 Mon Sep 17 00:00:00 2001
From: Matt Riedemann <mriedem@us.ibm.com>
Date: Mon, 13 Feb 2017 15:48:43 -0500
Subject: [PATCH] Cleanup some issues with CONF.placement.os_interface

This change fixes a few things with the recently added
"os_interface" option in the [placement] config group.

1. It adds tests for the scheduler report client that
   were missing in the original change that added the
   config option.

2. It uses the option in the "nova-status upgrade check"
   command so it is consistent with how the scheduler
   report client uses it.

3. It removes the restrictive choices list from the
   config option definition. keystoneauth1 allows an
   "auth" value for the endpoint interface which means
   don't use the service catalog to find the endpoint
   but instead just read it from the "auth_url" config
   option. Also, the Keystone v3 API performs strict
   validation of the endpoint interface when creating
   an endpoint record. The list of supported interfaces
   may change over time, so we shouldn't encode that
   list within Nova.

4. As part of removing the choices, the release note
   associated with the new option is updated and changed
   from a 'feature' release note to simply 'other' since
   it's not really a feature as much as it is a bug fix.

Change-Id: Ia5af05cc4d8155349bab942280c83e7318749959
Closes-Bug: #1664334
---
 nova/conf/placement.py                                 |  2 --
 .../api/openstack/placement/test_report_client.py      |  4 +---
 ...nt-api-endpoint-interface-set-29af8b9400ce7775.yaml | 10 ++++++----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/nova/conf/placement.py b/nova/conf/placement.py
index b11f873d2..14754bac5 100644
--- a/nova/conf/placement.py
+++ b/nova/conf/placement.py
@@ -29,8 +29,6 @@ Possible values:
 * Any string representing region name
 """),
     cfg.StrOpt('os_interface',
-               default="public",
-               choices=["public", "admin", "internal"],
                help="""
 Endpoint interface for this node. This is used when picking the URL in the
 service catalog.
diff --git a/nova/tests/functional/api/openstack/placement/test_report_client.py b/nova/tests/functional/api/openstack/placement/test_report_client.py
index dcce084af..258f8474d 100644
--- a/nova/tests/functional/api/openstack/placement/test_report_client.py
+++ b/nova/tests/functional/api/openstack/placement/test_report_client.py
@@ -31,9 +31,7 @@ class NoAuthReportClient(report.SchedulerReportClient):
     """A SchedulerReportClient that avoids keystone."""
 
     def __init__(self):
-        self._resource_providers = {}
-        self._provider_aggregate_map = {}
-        self._disabled = False
+        super(NoAuthReportClient, self).__init__()
         # Supply our own session so the wsgi-intercept can intercept
         # the right thing. Another option would be to use the direct
         # urllib3 interceptor.
diff --git a/releasenotes/notes/placement-api-endpoint-interface-set-29af8b9400ce7775.yaml b/releasenotes/notes/placement-api-endpoint-interface-set-29af8b9400ce7775.yaml
index 96c14e1cc..8f80b68ee 100644
--- a/releasenotes/notes/placement-api-endpoint-interface-set-29af8b9400ce7775.yaml
+++ b/releasenotes/notes/placement-api-endpoint-interface-set-29af8b9400ce7775.yaml
@@ -1,7 +1,9 @@
 ---
-features:
-  - The placement API can be set to connect to a specific
+other:
+  - The Placement API can be set to connect to a specific
     keystone endpoint interface using the ``os_interface``
     option in the ``[placement]`` section inside ``nova.conf``.
-    This value is not required and will default to ``public``.
-    Other acceptable options are  ``admin`` or ``internal``.
+    This value is not required but can be used if a non-default
+    endpoint interface is desired for connecting to the Placement
+    service. By default, keystoneauth will connect to the "public"
+    endpoint.