Merge "live_migration setting should be under libvirt namespace" into stable/ussuri

This commit is contained in:
Zuul 2021-04-13 01:52:15 +00:00 committed by Gerrit Code Review
commit dca5b16cb4
1 changed files with 3 additions and 3 deletions

View File

@ -847,7 +847,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::live_migration_wait_for_vif_plug: {get_param: NovaLiveMigrationWaitForVIFPlug} nova::compute::live_migration_wait_for_vif_plug: {get_param: NovaLiveMigrationWaitForVIFPlug}
nova::migration::live_migration_permit_post_copy: nova::migration::libvirt::live_migration_permit_post_copy:
if: if:
- permit_post_copy_set - permit_post_copy_set
- contains: - contains:
@ -857,7 +857,7 @@ outputs:
- reserved_huge_pages_set - reserved_huge_pages_set
- true - true
- false - false
nova::migration::live_migration_permit_auto_converge: nova::migration::libvirt::live_migration_permit_auto_converge:
if: if:
- permit_auto_converge_set - permit_auto_converge_set
- contains: - contains:
@ -875,7 +875,7 @@ outputs:
# In future versions of QEMU (2.6, mostly), danpb's native # In future versions of QEMU (2.6, mostly), danpb's native
# encryption work will obsolete the need to use TUNNELLED transport # encryption work will obsolete the need to use TUNNELLED transport
# mode. # mode.
nova::migration::live_migration_tunnelled: nova::migration::libvirt::live_migration_tunnelled:
if: if:
- enable_live_migration_tunnelled - enable_live_migration_tunnelled
- true - true