diff options
| author | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2011-03-18 09:53:28 +0000 |
|---|---|---|
| committer | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2011-03-18 09:53:28 +0000 |
| commit | 0fbd0e70b4699bb4a34792e14fd11c5b57636fde (patch) | |
| tree | 98de26eeca73da4a30a140542f53fc1422e78f2c /bin | |
| parent | 0174d584708f2e9b7fa02a27eeb707892eb213ec (diff) | |
| parent | abe147f756f13d4f968aa075d709e5c6643d310a (diff) | |
merge trunk
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-manage | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/nova-manage b/bin/nova-manage index a4d820209..6dcdddd5e 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -579,8 +579,10 @@ class VmCommands(object): ctxt = context.get_admin_context() instance_id = ec2utils.ec2_id_to_id(ec2_id) - if FLAGS.connection_type != 'libvirt': - msg = _('Only KVM is supported for now. Sorry!') + if (FLAGS.connection_type != 'libvirt' or + (FLAGS.connection_type == 'libvirt' and + FLAGS.libvirt_type not in ['kvm', 'qemu'])): + msg = _('Only KVM and QEmu are supported for now. Sorry!') raise exception.Error(msg) if (FLAGS.volume_driver != 'nova.volume.driver.AOEDriver' and \ |