From 42998d0a6fe1bed7876aadf604cf74f6c4eaff78 Mon Sep 17 00:00:00 2001
From: Florian Haas <florian@hastexo.com>
Date: Tue, 5 Jun 2012 20:56:00 +0200
Subject: More meaningful help messages for libvirt migration options

Change-Id: I08f4724a7ef664cfebba57c5c9495494853289a8
Reference: http://libvirt.org/html/libvirt-libvirt.html#virDomainMigrate
---
 Authors                         |  1 +
 nova/virt/libvirt/connection.py | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Authors b/Authors
index 0dc98da95..3448eb055 100644
--- a/Authors
+++ b/Authors
@@ -68,6 +68,7 @@ Eric Day <eday@oddments.org>
 Eric Windisch <eric@cloudscaling.com>
 Evan Callicoat <diopter@gmail.com>
 Ewan Mellor <ewan.mellor@citrix.com>
+Florian Haas <florian@hastexo.com>
 François Charlier <francois.charlier@enovance.com>
 Gabe Westmaas <gabe.westmaas@rackspace.com>
 Gabriel Hurley <gabriel@strikeawe.com>
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 11c9841b3..0cfcf2993 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -114,17 +114,19 @@ libvirt_opts = [
                 help='Sync virtual and real mouse cursors in Windows VMs'),
     cfg.StrOpt('live_migration_uri',
                default="qemu+tcp://%s/system",
-               help='Define protocol used by live_migration feature'),
+               help='Migration target URI '
+                    '(any included "%s" is replaced with '
+                    'the migration target hostname)'),
     cfg.StrOpt('live_migration_flag',
                default='VIR_MIGRATE_UNDEFINE_SOURCE, VIR_MIGRATE_PEER2PEER',
-               help='Define live migration behavior.'),
+               help='Migration flags to be set for live migration'),
     cfg.StrOpt('block_migration_flag',
                default='VIR_MIGRATE_UNDEFINE_SOURCE, VIR_MIGRATE_PEER2PEER, '
                        'VIR_MIGRATE_NON_SHARED_INC',
-               help='Define block migration behavior.'),
+               help='Migration flags to be set for block migration'),
     cfg.IntOpt('live_migration_bandwidth',
                default=0,
-               help='Define live migration behavior'),
+               help='Maximum bandwidth to be used during migration, in Mbps'),
     cfg.StrOpt('snapshot_image_format',
                default=None,
                help='Snapshot image format (valid options are : '
-- 
cgit