diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-17 19:54:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-17 19:54:36 +0000 |
| commit | 638bc907858e4da06ba2676fe704bfe46177b708 (patch) | |
| tree | 437bf8d1bd9b4887cba9a0533b61fb5de5844943 | |
| parent | e5b5a26e26bd327956cc35100333089d74d13580 (diff) | |
| parent | d2452dae6e780787dcf6685632d59d433a490307 (diff) | |
Merge "bug 931356: nova-manage prints libvirt related warnings if libvirt isn't installed"
| -rwxr-xr-x | bin/nova-manage | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/nova-manage b/bin/nova-manage index 770b95368..08c4133e3 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -106,7 +106,6 @@ flags.DECLARE('vlan_start', 'nova.network.manager') flags.DECLARE('vpn_start', 'nova.network.manager') flags.DECLARE('default_floating_pool', 'nova.network.manager') flags.DECLARE('public_interface', 'nova.network.linux_net') -flags.DECLARE('libvirt_type', 'nova.virt.libvirt.connection') # Decorators for actions @@ -1002,6 +1001,7 @@ class VmCommands(object): ctxt = context.get_admin_context() instance_id = ec2utils.ec2_id_to_id(ec2_id) + flags.DECLARE('libvirt_type', 'nova.virt.libvirt.connection') if (FLAGS.connection_type != 'libvirt' or (FLAGS.connection_type == 'libvirt' and FLAGS.libvirt_type not in ['kvm', 'qemu'])): |