Merge "Cleanup some issues with CONF.placement.os_interface"
This commit is contained in:
commit
0fe4cba325
nova
releasenotes/notes
@ -29,8 +29,6 @@ Possible values:
|
|||||||
* Any string representing region name
|
* Any string representing region name
|
||||||
"""),
|
"""),
|
||||||
cfg.StrOpt('os_interface',
|
cfg.StrOpt('os_interface',
|
||||||
default="public",
|
|
||||||
choices=["public", "admin", "internal"],
|
|
||||||
help="""
|
help="""
|
||||||
Endpoint interface for this node. This is used when picking the URL in the
|
Endpoint interface for this node. This is used when picking the URL in the
|
||||||
service catalog.
|
service catalog.
|
||||||
|
@ -31,9 +31,7 @@ class NoAuthReportClient(report.SchedulerReportClient):
|
|||||||
"""A SchedulerReportClient that avoids keystone."""
|
"""A SchedulerReportClient that avoids keystone."""
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self._resource_providers = {}
|
super(NoAuthReportClient, self).__init__()
|
||||||
self._provider_aggregate_map = {}
|
|
||||||
self._disabled = False
|
|
||||||
# Supply our own session so the wsgi-intercept can intercept
|
# Supply our own session so the wsgi-intercept can intercept
|
||||||
# the right thing. Another option would be to use the direct
|
# the right thing. Another option would be to use the direct
|
||||||
# urllib3 interceptor.
|
# urllib3 interceptor.
|
||||||
|
@ -1,7 +1,9 @@
|
|||||||
---
|
---
|
||||||
features:
|
other:
|
||||||
- The placement API can be set to connect to a specific
|
- The Placement API can be set to connect to a specific
|
||||||
keystone endpoint interface using the ``os_interface``
|
keystone endpoint interface using the ``os_interface``
|
||||||
option in the ``[placement]`` section inside ``nova.conf``.
|
option in the ``[placement]`` section inside ``nova.conf``.
|
||||||
This value is not required and will default to ``public``.
|
This value is not required but can be used if a non-default
|
||||||
Other acceptable options are ``admin`` or ``internal``.
|
endpoint interface is desired for connecting to the Placement
|
||||||
|
service. By default, keystoneauth will connect to the "public"
|
||||||
|
endpoint.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user