diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-09 05:45:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-09 05:45:59 +0000 |
| commit | c55aacfbacaa627eea9a3f20d3b8b4188552afe4 (patch) | |
| tree | 43de2e0fefa7e1887ddfcbd93bffe1e9dafc745b | |
| parent | ebbbcc6b110be9599f7c4ffbefc1ff8f1945c874 (diff) | |
| parent | 0e1bb7e36a19cd76175afc355ddbf28a41e6580b (diff) | |
| download | nova-c55aacfbacaa627eea9a3f20d3b8b4188552afe4.tar.gz | |
Merge "Fix duplicate lines in policy.json" into stable/liberty
| -rw-r--r-- | etc/nova/policy.json | 3 | ||||
| -rw-r--r-- | nova/tests/unit/test_policy.py | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/etc/nova/policy.json b/etc/nova/policy.json index 5f6023e5c3..129acfc7a4 100644 --- a/etc/nova/policy.json +++ b/etc/nova/policy.json @@ -85,9 +85,6 @@ "compute:security_groups:add_to_instance": "", "compute:security_groups:remove_from_instance": "", - "compute:delete": "", - "compute:soft_delete": "", - "compute:force_delete": "", "compute:restore": "", "compute:volume_snapshot_create": "", diff --git a/nova/tests/unit/test_policy.py b/nova/tests/unit/test_policy.py index a99f79a04c..249392e002 100644 --- a/nova/tests/unit/test_policy.py +++ b/nova/tests/unit/test_policy.py @@ -368,6 +368,9 @@ class RealRolePolicyTestCase(test.NoDBTestCase): "default", "compute:start", "compute:stop", +"compute:delete", +"compute:soft_delete", +"compute:force_delete", "compute_extension:admin_actions:pause", "compute_extension:admin_actions:unpause", "compute_extension:admin_actions:suspend", @@ -405,8 +408,6 @@ class RealRolePolicyTestCase(test.NoDBTestCase): "compute:create", "compute:create:attach_network", "compute:create:attach_volume", -"compute:delete", -"compute:force_delete", "compute:get_all_instance_metadata", "compute:get_all_instance_system_metadata", "compute:get_console_output", @@ -452,7 +453,6 @@ class RealRolePolicyTestCase(test.NoDBTestCase): "compute:security_groups:remove_from_instance", "compute:set_admin_password", "compute:snapshot", -"compute:soft_delete", "compute:suspend", "compute:swap_volume", "compute:unlock", |