Merge "Use default value for NovaLiveMigrationWaitForVIFPlug"

deployment/nova/nova-compute-container-puppet.yaml

@@ -306,11 +306,6 @@ parameters:
     type: number
     tags:
       - role_specific
-  NeutronMechanismDrivers:
-    default: 'ovn'
-    description: |
-        The mechanism drivers for the Neutron tenant network.
-    type: comma_delimited_list
   NovaLiveMigrationWaitForVIFPlug:
     description: Whether to wait for `network-vif-plugged` events before starting guest transfer.
     default: true
@@ -436,8 +431,6 @@ conditions:
 
   is_not_additional_cell: {equals: [{get_param: NovaAdditionalCell}, false]}
 
-  is_ovn_in_neutron_mechanism_driver: {contains: ['ovn', {get_param: NeutronMechanismDrivers}]}
-
   nova_nfs_enabled:
     or:
       - and:
@@ -506,11 +499,7 @@ outputs:
             nova::compute::instance_usage_audit_period: 'hour'
             nova::compute::consecutive_build_service_disable_threshold: {get_param: NovaAutoDisabling}
             nova::compute::rbd::ephemeral_storage: {get_param: NovaEnableRbdBackend}
-            nova::compute::live_migration_wait_for_vif_plug:
-              if:
-              - is_ovn_in_neutron_mechanism_driver
-              - false
-              - {get_param: NovaLiveMigrationWaitForVIFPlug}
+            nova::compute::live_migration_wait_for_vif_plug: {get_param: NovaLiveMigrationWaitForVIFPlug}
             # TUNNELLED mode provides a security improvement for migration, but
             # 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).

releasenotes/notes/live_migration_wait_for_vif_plug-6d16da261a138fb8.yaml

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