summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorSoren Hansen <soren@linux2go.dk>2011-03-17 22:16:27 +0000
committerTarmac <>2011-03-17 22:16:27 +0000
commit0d40b15dc011324a4ebf7a7c6150cf3e4fd151d9 (patch)
tree47233825bea70110d12ddd95988a24583072e7bb /bin
parent4edbeea2e81a7aff271be5e96cc18cb3ea6e5133 (diff)
parentcf648ea89015818a3ec7c8d6d59b50f8ed3604f7 (diff)
Fix a couple of things that assume that libvirt == kvm/qemu.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/nova-manage6
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 \