diff options
| author | Josh Kearney <josh@jk0.org> | 2011-03-24 13:10:22 -0500 |
|---|---|---|
| committer | Josh Kearney <josh@jk0.org> | 2011-03-24 13:10:22 -0500 |
| commit | e976f5b3e6b02b4bb8c4144368b4c4e097df8b8c (patch) | |
| tree | 7c029e245690fd572c744964c884a8e950d55695 /bin | |
| parent | 5774357b365e1db624cdd2a9abed9828b27e3314 (diff) | |
| parent | 0797161b89531cc8d5fe29c208723f39bcbd8046 (diff) | |
Merged trunk
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-manage | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/nova-manage b/bin/nova-manage index 69cbf6f95..cf0caf47e 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -97,6 +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.DEFINE_flag(flags.HelpFlag()) flags.DEFINE_flag(flags.HelpshortFlag()) flags.DEFINE_flag(flags.HelpXMLFlag()) @@ -610,7 +611,7 @@ class ServiceCommands(object): args: [host] [service]""" ctxt = context.get_admin_context() now = datetime.datetime.utcnow() - services = db.service_get_all(ctxt) + db.service_get_all(ctxt, True) + services = db.service_get_all(ctxt) if host: services = [s for s in services if s['host'] == host] if service: |