Merge "Fixes Nova live-migration post-copy" into stable/ussuri

This commit is contained in:
Zuul 2022-09-04 16:47:22 +00:00 committed by Gerrit Code Review
commit 2f3fd6afd3
3 changed files with 8 additions and 3 deletions

View File

@ -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'

View File

@ -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 }}

View File

@ -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 }}