openstack
/
nova
Code Issues Proposed changes

Merge "Make lock policy default to admin or owner"

This commit is contained in:
Jenkins 2015-12-18 17:10:33 +00:00 committed by Gerrit Code Review
parent 5f21a5e131 ee7991489a
commit 0d28ab4671
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/nova/policy.json
View File

@ -29,8 +29,8 @@
"compute:stop": "rule:admin_or_owner",
"compute:get_lock": "",
"compute:lock": "",
"compute:unlock": "",
"compute:lock": "rule:admin_or_owner",
"compute:unlock": "rule:admin_or_owner",
"compute:unlock_override": "rule:admin_api",
"compute:get_vnc_console": "",

4
nova/tests/unit/test_policy.py
View File

@ -369,6 +369,8 @@ class RealRolePolicyTestCase(test.NoDBTestCase):
"compute:delete",
"compute:soft_delete",
"compute:force_delete",
"compute:lock",
"compute:unlock",
"compute_extension:admin_actions:pause",
"compute_extension:admin_actions:unpause",
"compute_extension:admin_actions:suspend",
@ -439,7 +441,6 @@ class RealRolePolicyTestCase(test.NoDBTestCase):
"compute:get_spice_console",
"compute:get_vnc_console",
"compute:inject_network_info",
"compute:lock",
"compute:pause",
"compute:remove_fixed_ip",
"compute:rescue",
@ -452,7 +453,6 @@ class RealRolePolicyTestCase(test.NoDBTestCase):
"compute:snapshot",
"compute:suspend",
"compute:swap_volume",
"compute:unlock",
"compute:unpause",
"compute:unrescue",
"compute:update",