diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-17 13:19:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-17 13:19:35 +0000 |
| commit | 72c7b866ed92d638bf8f5563ff7ea2568548764a (patch) | |
| tree | 82bc4f86be865677c1d2832793e5cc5896d95423 /etc | |
| parent | 53c40cfc18fe5c57ca724e5d7902e18fe09cc09f (diff) | |
| parent | 1cf475d7a135c1078cf7df11c261618af501dc37 (diff) | |
Merge "Revert per-user-quotas"
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/nova/policy.json | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/etc/nova/policy.json b/etc/nova/policy.json index 72390c75e..3970ce96a 100644 --- a/etc/nova/policy.json +++ b/etc/nova/policy.json @@ -1,6 +1,5 @@ { "admin_or_owner": [["role:admin"], ["project_id:%(project_id)s"]], - "admin_or_projectadmin": [["role:projectadmin"], ["role:admin"]], "default": [["rule:admin_or_owner"]], @@ -49,8 +48,7 @@ "compute_extension:networks": [["rule:admin_api"]], "compute_extension:networks:view": [], "compute_extension:quotas:show": [], - "compute_extension:quotas:update_for_project": [["rule:admin_api"]], - "compute_extension:quotas:update_for_user": [["rule:admin_or_projectadmin"]], + "compute_extension:quotas:update": [["rule:admin_api"]], "compute_extension:quota_classes": [], "compute_extension:rescue": [], "compute_extension:security_groups": [], |