From b2b286b4a54ad4de6a8586e1f1d977487dd05451 Mon Sep 17 00:00:00 2001
From: Gauvain Pocentek <gauvain.pocentek@objectif-libre.com>
Date: Wed, 20 May 2015 11:56:45 -0700
Subject: [PATCH] Live migration setup is not needed in kilo

Specify that nova configuration for live migration is only needed for
release prior to Kilo.

Change-Id: I1f881da9eaa82a3e3ac01660aaf612b4a4d153e4
Closes-Bug: #1455681
---
 .../section_compute-configure-migrations.xml  | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/doc/admin-guide-cloud/compute/section_compute-configure-migrations.xml b/doc/admin-guide-cloud/compute/section_compute-configure-migrations.xml
index fcef45f7ce..815637725a 100644
--- a/doc/admin-guide-cloud/compute/section_compute-configure-migrations.xml
+++ b/doc/admin-guide-cloud/compute/section_compute-configure-migrations.xml
@@ -276,15 +276,18 @@ HostA:               921515008 101921792 772783104  12% /var/lib/nova/instances
       </section>
       <section xml:id="true-live-migration-kvm-libvirt">
         <title>Enabling true live migration</title>
-        <para>By default, the Compute service does not use the libvirt live
-        migration function. To enable this function, add the following line to
-        the <filename>nova.conf</filename> file:
+        <para>Prior to the Kilo release, the Compute service did not use the
+            libvirt live migration function by default. To enable this
+            function, add the following line to the
+            <literal>[libvirt]</literal> section of the
+            <filename>nova.conf</filename> file:
         </para>
-        <programlisting>live_migration_flag=VIR_MIGRATE_UNDEFINE_SOURCE,VIR_MIGRATE_PEER2PEER,VIR_MIGRATE_LIVE, VIR_MIGRATE_TUNNELLED</programlisting>
-        <para>The Compute service does not use libvirt's live migration by
-        default because there is a risk that the migration process will never
-        end. This can happen if the guest operating system uses blocks on the
-        disk faster than they can be migrated.
+        <programlisting>live_migration_flag=VIR_MIGRATE_UNDEFINE_SOURCE,VIR_MIGRATE_PEER2PEER,VIR_MIGRATE_LIVE,VIR_MIGRATE_TUNNELLED</programlisting>
+        <para>On versions older than Kilo, the Compute service does not use
+            libvirt's live migration by default because there is a risk that
+            the migration process will never end. This can happen if the guest
+            operating system uses blocks on the disk faster than they can be
+            migrated.
         </para>
       </section>
     </section>