Browse Source

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

tags/10.6.1
Zuul 3 weeks ago
parent
commit
c9eb4febbd

+ 1
- 12
deployment/nova/nova-compute-container-puppet.yaml View File

@@ -302,11 +302,6 @@ parameters:
302 302
     type: number
303 303
     tags:
304 304
       - role_specific
305
-  NeutronMechanismDrivers:
306
-    default: 'ovn'
307
-    description: |
308
-        The mechanism drivers for the Neutron tenant network.
309
-    type: comma_delimited_list
310 305
   NovaLiveMigrationWaitForVIFPlug:
311 306
     description: Whether to wait for `network-vif-plugged` events before starting guest transfer.
312 307
     default: true
@@ -424,8 +419,6 @@ conditions:
424 419
 
425 420
   is_not_additional_cell: {equals: [{get_param: NovaAdditionalCell}, false]}
426 421
 
427
-  is_ovn_in_neutron_mechanism_driver: {contains: ['ovn', {get_param: NeutronMechanismDrivers}]}
428
-
429 422
   nova_nfs_enabled:
430 423
     or:
431 424
       - and:
@@ -486,11 +479,7 @@ outputs:
486 479
             nova::compute::instance_usage_audit_period: 'hour'
487 480
             nova::compute::consecutive_build_service_disable_threshold: {get_param: NovaAutoDisabling}
488 481
             nova::compute::rbd::ephemeral_storage: {get_param: NovaEnableRbdBackend}
489
-            nova::compute::live_migration_wait_for_vif_plug:
490
-              if:
491
-              - is_ovn_in_neutron_mechanism_driver
492
-              - false
493
-              - {get_param: NovaLiveMigrationWaitForVIFPlug}
482
+            nova::compute::live_migration_wait_for_vif_plug: {get_param: NovaLiveMigrationWaitForVIFPlug}
494 483
             # TUNNELLED mode provides a security improvement for migration, but
495 484
             # can't be used in combination with block migration. So we only enable it
496 485
             # when shared storage is available (Ceph RDB is currently the only option).

+ 1
- 2
releasenotes/notes/live_migration_wait_for_vif_plug-6d16da261a138fb8.yaml View File

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

Loading…
Cancel
Save