Make lock policy default to admin or owner

compute:lock and compute:unlock are currently
used by compute.api function wrap_check_policy
this patch set the default value of them to be
same to os_compute_api:os-lock-server.

DocImpact: make the default policy to identical to v2.1 policy.
UpgradeImpact: old cloud need to care the default value change.

Change-Id: Ib862696bbfb7e979d6198f5ca3155f5d1e7b396b
This commit is contained in:
jichenjc 2015-11-04 22:23:44 +08:00
parent 3be51f19ae
commit ee7991489a
2 changed files with 4 additions and 4 deletions

View File

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

View File

@ -371,6 +371,8 @@ class RealRolePolicyTestCase(test.NoDBTestCase):
"compute:delete", "compute:delete",
"compute:soft_delete", "compute:soft_delete",
"compute:force_delete", "compute:force_delete",
"compute:lock",
"compute:unlock",
"compute_extension:admin_actions:pause", "compute_extension:admin_actions:pause",
"compute_extension:admin_actions:unpause", "compute_extension:admin_actions:unpause",
"compute_extension:admin_actions:suspend", "compute_extension:admin_actions:suspend",
@ -442,7 +444,6 @@ class RealRolePolicyTestCase(test.NoDBTestCase):
"compute:get_spice_console", "compute:get_spice_console",
"compute:get_vnc_console", "compute:get_vnc_console",
"compute:inject_network_info", "compute:inject_network_info",
"compute:lock",
"compute:pause", "compute:pause",
"compute:remove_fixed_ip", "compute:remove_fixed_ip",
"compute:rescue", "compute:rescue",
@ -455,7 +456,6 @@ class RealRolePolicyTestCase(test.NoDBTestCase):
"compute:snapshot", "compute:snapshot",
"compute:suspend", "compute:suspend",
"compute:swap_volume", "compute:swap_volume",
"compute:unlock",
"compute:unpause", "compute:unpause",
"compute:unrescue", "compute:unrescue",
"compute:update", "compute:update",