summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorCerberus <matt.dietz@rackspace.com>2011-01-31 17:05:54 -0600
committerCerberus <matt.dietz@rackspace.com>2011-01-31 17:05:54 -0600
commit7b8ddb4e00c7b592697a2db521a8655d84ca0356 (patch)
tree80fbeaee460704669bd5bcaf4d41b1fe1b7cf0da /nova/api
parenta83c914a563f284672514118ef02c41e60f0025a (diff)
parentad6300d279cfd87061ef4cef5f1a9e96aaac2f42 (diff)
downloadnova-7b8ddb4e00c7b592697a2db521a8655d84ca0356.tar.gz
nova-7b8ddb4e00c7b592697a2db521a8655d84ca0356.tar.xz
nova-7b8ddb4e00c7b592697a2db521a8655d84ca0356.zip
Merge from trunk
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/ec2/admin.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/nova/api/ec2/admin.py b/nova/api/ec2/admin.py
index d7e899d12..735951082 100644
--- a/nova/api/ec2/admin.py
+++ b/nova/api/ec2/admin.py
@@ -184,6 +184,17 @@ class AdminController(object):
description=None,
member_users=None))
+ def modify_project(self, context, name, manager_user, description=None,
+ **kwargs):
+ """Modifies a project"""
+ msg = _("Modify project: %(name)s managed by"
+ " %(manager_user)s") % locals()
+ LOG.audit(msg, context=context)
+ manager.AuthManager().modify_project(name,
+ manager_user=manager_user,
+ description=description)
+ return True
+
def deregister_project(self, context, name):
"""Permanently deletes a project."""
LOG.audit(_("Delete project: %s"), name, context=context)