Merge "Disable tunneled mode when use_tls_for_live_migration" into stable/victoria
This commit is contained in:
commit
e361984f96
|
@ -540,6 +540,15 @@ parameters:
|
|||
default: 0
|
||||
tags:
|
||||
- role_specific
|
||||
EnableInternalTLS:
|
||||
type: boolean
|
||||
default: false
|
||||
UseTLSTransportForLiveMigration:
|
||||
type: boolean
|
||||
default: true
|
||||
description: If set to true and if EnableInternalTLS is enabled, it will
|
||||
set the libvirt URI's transport to tls and configure the
|
||||
relevant keys for libvirt.
|
||||
|
||||
# DEPRECATED: the following options are deprecated and are currently maintained
|
||||
# for backwards compatibility. They will be removed in future release.
|
||||
|
@ -740,16 +749,23 @@ resources:
|
|||
conditions:
|
||||
enable_instance_ha: {equals: [{get_param: EnableInstanceHA}, true]}
|
||||
|
||||
use_tls_for_live_migration:
|
||||
and:
|
||||
- {get_param: EnableInternalTLS}
|
||||
- {get_param: UseTLSTransportForLiveMigration}
|
||||
|
||||
enable_live_migration_tunnelled:
|
||||
or:
|
||||
- and:
|
||||
- equals: [{get_param: NovaNfsEnabled}, true]
|
||||
- equals: [{get_param: [RoleParameters, NovaNfsEnabled]}, '']
|
||||
- equals: [{get_param: [RoleParameters, NovaNfsEnabled]}, true]
|
||||
- equals: [{get_param: [RoleParameters, NovaEnableRbdBackend]}, true]
|
||||
- and:
|
||||
- equals: [{get_param: [RoleParameters, NovaEnableRbdBackend]}, '']
|
||||
- equals: [{get_param: NovaEnableRbdBackend}, true]
|
||||
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:
|
||||
not:
|
||||
|
|
|
@ -273,12 +273,8 @@ conditions:
|
|||
|
||||
use_tls_for_live_migration:
|
||||
and:
|
||||
- equals:
|
||||
- {get_param: EnableInternalTLS}
|
||||
- true
|
||||
- equals:
|
||||
- {get_param: UseTLSTransportForLiveMigration}
|
||||
- true
|
||||
|
||||
libvirt_specific_ca_unset:
|
||||
equals:
|
||||
|
|
Loading…
Reference in New Issue