Merge "Cleanup some issues with CONF.placement.os_interface"

This commit is contained in:
Jenkins 2017-02-15 17:09:36 +00:00 committed by Gerrit Code Review
commit 0fe4cba325
3 changed files with 7 additions and 9 deletions

View File

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

View File

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

View File

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