diff options
| author | Eoghan Glynn <eglynn@redhat.com> | 2012-08-16 16:11:03 +0100 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2012-08-16 22:51:02 -0700 |
| commit | 1cf475d7a135c1078cf7df11c261618af501dc37 (patch) | |
| tree | 2edca13cb18fd30557f745db9cf5ace886b1e82c /etc/nova | |
| parent | 06d1f0dfd5d22ace96b414fd0b71fbaa668b95ce (diff) | |
| download | nova-1cf475d7a135c1078cf7df11c261618af501dc37.tar.gz nova-1cf475d7a135c1078cf7df11c261618af501dc37.tar.xz nova-1cf475d7a135c1078cf7df11c261618af501dc37.zip | |
Revert per-user-quotas
See bug 1034384, bug 1037590.
This reverts commit https://github.com/openstack/nova/commit/391f345d,
but leaves the DB migration in place while adding a further
migration to reverse it.
The motivation for reversion is that the per-user quota logic would
totally undermine the per-project quotas set for a pre-existing
openstack install.
The per-user quota logic could be re-introduced in a fixed state
after Folsom-3.
Change-Id: Idd4b55a2404a25f43f6737b661f828c28501066f
Diffstat (limited to 'etc/nova')
| -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": [], |