diff --git a/config.yaml b/config.yaml
index 5911673e..d6c8a535 100644
--- a/config.yaml
+++ b/config.yaml
@@ -147,14 +147,17 @@ options:
     type: boolean
     default: False
     description: |
-      If live-migration is enabled, this option allows Nova to switch an on-
-      going live migration to post-copy mode.
+      If live-migration is enabled, this option allows Nova to switch an
+      on-going live migration to post-copy mode. The switch will happen if the
+      migration reaches 'live-migration-completion-timeout'. This supersedes
+      'live-migration-permit-auto-converge'.
   live-migration-permit-auto-converge:
     type: boolean
     default: False
     description: |
       If live-migration is enabled, this option allows Nova to throttle down
-      CPU when an on-going live migration is slow.
+      CPU when an on-going live migration is slow. This is superseded by
+      'live-migration-permit-post-copy'.
   authorized-keys-path:
     type: string
     default: '{homedir}/.ssh/authorized_keys'
diff --git a/templates/stein/nova.conf b/templates/stein/nova.conf
index 44330199..0f7fa2a3 100644
--- a/templates/stein/nova.conf
+++ b/templates/stein/nova.conf
@@ -295,6 +295,7 @@ live_migration_downtime_delay = {{ live_migration_downtime_delay }}
 {% endif -%}
 {% if live_migration_permit_post_copy -%}
 live_migration_permit_post_copy = {{ live_migration_permit_post_copy }}
+live_migration_timeout_action = force_complete
 {% endif -%}
 {% if live_migration_permit_auto_converge -%}
 live_migration_permit_auto_converge = {{ live_migration_permit_auto_converge }}
diff --git a/templates/train/nova.conf b/templates/train/nova.conf
index dc9507e2..fbff919a 100644
--- a/templates/train/nova.conf
+++ b/templates/train/nova.conf
@@ -302,6 +302,7 @@ live_migration_downtime_delay = {{ live_migration_downtime_delay }}
 {% endif -%}
 {% if live_migration_permit_post_copy -%}
 live_migration_permit_post_copy = {{ live_migration_permit_post_copy }}
+live_migration_timeout_action = force_complete
 {% endif -%}
 {% if live_migration_permit_auto_converge -%}
 live_migration_permit_auto_converge = {{ live_migration_permit_auto_converge }}