openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Use default value for NovaLiveMigrationWaitForVIFPlug" into stable/stein

This commit is contained in:
Zuul 2019-08-28 00:01:47 +00:00 committed by Gerrit Code Review
parent d3007ad774 79b0ff8e9c
commit c9eb4febbd
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
deployment/nova/nova-compute-container-puppet.yaml
View File

@ -302,11 +302,6 @@ parameters:
type: number type: number
tags: tags:
- role_specific - role_specific
NeutronMechanismDrivers:
default: 'ovn'
description: |
The mechanism drivers for the Neutron tenant network.
type: comma_delimited_list
NovaLiveMigrationWaitForVIFPlug: NovaLiveMigrationWaitForVIFPlug:
description: Whether to wait for `network-vif-plugged` events before starting guest transfer. description: Whether to wait for `network-vif-plugged` events before starting guest transfer.
default: true default: true
@ -424,8 +419,6 @@ conditions:
is_not_additional_cell: {equals: [{get_param: NovaAdditionalCell}, false]} is_not_additional_cell: {equals: [{get_param: NovaAdditionalCell}, false]}
is_ovn_in_neutron_mechanism_driver: {contains: ['ovn', {get_param: NeutronMechanismDrivers}]}
nova_nfs_enabled: nova_nfs_enabled:
or: or:
- and: - and:
@ -486,11 +479,7 @@ outputs:
nova::compute::instance_usage_audit_period: 'hour' nova::compute::instance_usage_audit_period: 'hour'
nova::compute::consecutive_build_service_disable_threshold: {get_param: NovaAutoDisabling} nova::compute::consecutive_build_service_disable_threshold: {get_param: NovaAutoDisabling}
nova::compute::rbd::ephemeral_storage: {get_param: NovaEnableRbdBackend} nova::compute::rbd::ephemeral_storage: {get_param: NovaEnableRbdBackend}
nova::compute::live_migration_wait_for_vif_plug: nova::compute::live_migration_wait_for_vif_plug: {get_param: NovaLiveMigrationWaitForVIFPlug}
if:
- is_ovn_in_neutron_mechanism_driver
- false
- {get_param: NovaLiveMigrationWaitForVIFPlug}
# TUNNELLED mode provides a security improvement for migration, but # TUNNELLED mode provides a security improvement for migration, but
# can't be used in combination with block migration. So we only enable it # 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). # when shared storage is available (Ceph RDB is currently the only option).

3
releasenotes/notes/live_migration_wait_for_vif_plug-6d16da261a138fb8.yaml
View File

@ -4,6 +4,5 @@ features:
Add parameter `NovaLiveMigrationWaitForVIFPlug` which allows to set Add parameter `NovaLiveMigrationWaitForVIFPlug` which allows to set
`live_migration_wait_for_vif_plug` which in turn allows whether to `live_migration_wait_for_vif_plug` which in turn allows whether to
wait for ``network-vif-plugged`` events before starting guest transfer. wait for ``network-vif-plugged`` events before starting guest transfer.
The default value for the parameter is set to true and it is set The default value for the parameter is set to true.
to false when `ovn` is in `NeutronMechanismDrivers` list.