diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-05-26 12:06:54 -0400 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-05-26 12:06:54 -0400 |
| commit | 308d9f0ba185c8cfc3ff28b744bd684c2aa7e775 (patch) | |
| tree | fe1408032aa0840336e9fc2fc5eb60080b29c570 /bin | |
| parent | 2c16eb37822b3ebdb14ac36df26362636d0f5078 (diff) | |
| parent | db18a792414240cbdb1221d0e79e8a63313f103e (diff) | |
| download | nova-308d9f0ba185c8cfc3ff28b744bd684c2aa7e775.tar.gz nova-308d9f0ba185c8cfc3ff28b744bd684c2aa7e775.tar.xz nova-308d9f0ba185c8cfc3ff28b744bd684c2aa7e775.zip | |
merging trunk
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-dhcpbridge | 7 | ||||
| -rwxr-xr-x | bin/nova-manage | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge index f42dfd6b5..5926b97de 100755 --- a/bin/nova-dhcpbridge +++ b/bin/nova-dhcpbridge @@ -108,6 +108,13 @@ def main(): interface = os.environ.get('DNSMASQ_INTERFACE', FLAGS.dnsmasq_interface) if int(os.environ.get('TESTING', '0')): from nova.tests import fake_flags + + #if FLAGS.fake_rabbit: + # LOG.debug(_("leasing ip")) + # network_manager = utils.import_object(FLAGS.network_manager) + ## reload(fake_flags) + # from nova.tests import fake_flags + action = argv[1] if action in ['add', 'del', 'old']: mac = argv[2] 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): |