From 1cf475d7a135c1078cf7df11c261618af501dc37 Mon Sep 17 00:00:00 2001 From: Eoghan Glynn Date: Thu, 16 Aug 2012 16:11:03 +0100 Subject: 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 --- etc/nova/policy.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'etc/nova') 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": [], -- cgit