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.