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
|
default: 0
|
||||||
tags:
|
tags:
|
||||||
- role_specific
|
- 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
|
# DEPRECATED: the following options are deprecated and are currently maintained
|
||||||
# for backwards compatibility. They will be removed in future release.
|
# for backwards compatibility. They will be removed in future release.
|
||||||
|
@ -740,16 +749,23 @@ resources:
|
||||||
conditions:
|
conditions:
|
||||||
enable_instance_ha: {equals: [{get_param: EnableInstanceHA}, true]}
|
enable_instance_ha: {equals: [{get_param: EnableInstanceHA}, true]}
|
||||||
|
|
||||||
|
use_tls_for_live_migration:
|
||||||
|
and:
|
||||||
|
- {get_param: EnableInternalTLS}
|
||||||
|
- {get_param: UseTLSTransportForLiveMigration}
|
||||||
|
|
||||||
enable_live_migration_tunnelled:
|
enable_live_migration_tunnelled:
|
||||||
or:
|
and:
|
||||||
- and:
|
- or:
|
||||||
- equals: [{get_param: NovaNfsEnabled}, true]
|
- and:
|
||||||
- equals: [{get_param: [RoleParameters, NovaNfsEnabled]}, '']
|
- {get_param: NovaNfsEnabled}
|
||||||
- equals: [{get_param: [RoleParameters, NovaNfsEnabled]}, true]
|
- equals: [{get_param: [RoleParameters, NovaNfsEnabled]}, '']
|
||||||
- equals: [{get_param: [RoleParameters, NovaEnableRbdBackend]}, true]
|
- equals: [{get_param: [RoleParameters, NovaNfsEnabled]}, true]
|
||||||
- and:
|
- equals: [{get_param: [RoleParameters, NovaEnableRbdBackend]}, true]
|
||||||
- equals: [{get_param: [RoleParameters, NovaEnableRbdBackend]}, '']
|
- and:
|
||||||
- equals: [{get_param: NovaEnableRbdBackend}, true]
|
- 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:
|
||||||
|
|
|
@ -273,12 +273,8 @@ conditions:
|
||||||
|
|
||||||
use_tls_for_live_migration:
|
use_tls_for_live_migration:
|
||||||
and:
|
and:
|
||||||
- equals:
|
|
||||||
- {get_param: EnableInternalTLS}
|
- {get_param: EnableInternalTLS}
|
||||||
- true
|
|
||||||
- equals:
|
|
||||||
- {get_param: UseTLSTransportForLiveMigration}
|
- {get_param: UseTLSTransportForLiveMigration}
|
||||||
- true
|
|
||||||
|
|
||||||
libvirt_specific_ca_unset:
|
libvirt_specific_ca_unset:
|
||||||
equals:
|
equals:
|
||||||
|
|
Loading…
Reference in New Issue