diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-05-26 12:00:15 -0700 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-05-26 12:00:15 -0700 |
| commit | cc7aec17929414c58bbfdde609930e66e6f17028 (patch) | |
| tree | 32c3a7d1a554f1519edd9d4df53d38983ba12177 /bin | |
| parent | c0cc56e3b7f00bc57316acfd92f2ceba4fc2be30 (diff) | |
| parent | cc51542911e4a34df75bd23a4a71a395e906e681 (diff) | |
| download | nova-cc7aec17929414c58bbfdde609930e66e6f17028.tar.gz nova-cc7aec17929414c58bbfdde609930e66e6f17028.tar.xz nova-cc7aec17929414c58bbfdde609930e66e6f17028.zip | |
branch 2a merge (including trunk)
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-manage | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bin/nova-manage b/bin/nova-manage index e3ed7b9d0..26c0d776c 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -97,7 +97,7 @@ flags.DECLARE('vlan_start', 'nova.network.manager') flags.DECLARE('vpn_start', 'nova.network.manager') flags.DECLARE('fixed_range_v6', 'nova.network.manager') flags.DECLARE('images_path', 'nova.image.local') -flags.DECLARE('libvirt_type', 'nova.virt.libvirt_conn') +flags.DECLARE('libvirt_type', 'nova.virt.libvirt.connection') flags.DEFINE_flag(flags.HelpFlag()) flags.DEFINE_flag(flags.HelpshortFlag()) flags.DEFINE_flag(flags.HelpXMLFlag()) @@ -417,12 +417,16 @@ class ProjectCommands(object): arguments: project_id [key] [value]""" ctxt = context.get_admin_context() if key: + if value.lower() == 'unlimited': + value = None try: db.quota_update(ctxt, project_id, key, value) except exception.ProjectQuotaNotFound: db.quota_create(ctxt, project_id, key, value) - project_quota = quota.get_quota(ctxt, project_id) + project_quota = quota.get_project_quotas(ctxt, project_id) for key, value in project_quota.iteritems(): + if value is None: + value = 'unlimited' print '%s: %s' % (key, value) def remove(self, project_id, user_id): |