openstack
/
nova
Code Issues Proposed changes

Merge "api-ref: fix mention of all_tenants filter for non-admins"

This commit is contained in:
Zuul 2019-05-13 12:47:56 +00:00 committed by Gerrit Code Review
parent 12ebe26823 57646dfe77
commit 26b1761f3c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api-ref/source/servers.inc
View File

@ -156,7 +156,6 @@ whitelist will be silently ignored.
- For non-admin users, whitelist is different from admin users whitelist.
Valid whitelist for non-admin users includes
- ``all_tenants``
- ``changes-since``
- ``flavor``
- ``image``

5
nova/api/openstack/compute/servers.py
View File

@ -1221,6 +1221,11 @@ class ServersController(wsgi.Controller):
def _get_server_search_options(self, req):
"""Return server search options allowed by non-admin."""
# NOTE(mriedem): all_tenants is admin-only by default but because of
# tight-coupling between this method, the remove_invalid_options method
# and how _get_servers uses them, we include all_tenants here but it
# will be removed later for non-admins. Fixing this would be nice but
# probably not trivial.
opt_list = ('reservation_id', 'name', 'status', 'image', 'flavor',
'ip', 'changes-since', 'all_tenants')
if api_version_request.is_supported(req, min_version='2.5'):