Merge "Disable tunnelled migration" into stable/train

This commit is contained in:
Zuul 2021-06-04 10:55:55 +00:00 committed by Gerrit Code Review
commit b3d499dc3b
1 changed files with 2 additions and 26 deletions

View File

@ -701,19 +701,6 @@ conditions:
- {get_param: EnableInternalTLS} - {get_param: EnableInternalTLS}
- {get_param: UseTLSTransportForLiveMigration} - {get_param: UseTLSTransportForLiveMigration}
enable_live_migration_tunnelled:
and:
- or:
- and:
- {get_param: NovaNfsEnabled}
- equals: [{get_param: [RoleParameters, NovaNfsEnabled]}, '']
- equals: [{get_param: [RoleParameters, NovaNfsEnabled]}, true]
- equals: [{get_param: [RoleParameters, NovaEnableRbdBackend]}, true]
- and:
- equals: [{get_param: [RoleParameters, NovaEnableRbdBackend]}, '']
- {get_param: NovaEnableRbdBackend}
- not: use_tls_for_live_migration
libvirt_file_backed_memory_enabled: libvirt_file_backed_memory_enabled:
not: not:
or: or:
@ -846,19 +833,8 @@ outputs:
- live_migration_optimization_set - live_migration_optimization_set
- true - true
- false - false
# TUNNELLED mode is not compatible with post_copy.
# TUNNELLED mode provides a security improvement for migration, but nova::migration::libvirt::live_migration_tunnelled: false
# can't be used in combination with block migration. So we only enable it
# when shared storage is available (Ceph RDB is currently the only option).
# See https://bugzilla.redhat.com/show_bug.cgi?id=1301986#c12
# In future versions of QEMU (2.6, mostly), danpb's native
# encryption work will obsolete the need to use TUNNELLED transport
# mode.
nova::migration::libvirt::live_migration_tunnelled:
if:
- enable_live_migration_tunnelled
- true
- false
# NOTE: bind IP is found in hiera replacing the network name with the # NOTE: bind IP is found in hiera replacing the network name with the
# local node IP for the given network; replacement examples # local node IP for the given network; replacement examples
# (eg. for internal_api): # (eg. for internal_api):