diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml index 187b2d850f..52a60a7bed 100644 --- a/deployment/nova/nova-compute-container-puppet.yaml +++ b/deployment/nova/nova-compute-container-puppet.yaml @@ -1002,6 +1002,11 @@ conditions: - equals: [{get_param: [RoleParameters, NovaReservedHugePages]}, ""] - equals: [{get_param: NovaReservedHugePages}, []] + live_migration_optimization_set: + and: + - not: {equals: [{get_param: [RoleParameters, TunedProfileName]}, 'realtime-virtual-host']} + - reserved_huge_pages_set + ovs_dpdk_socket_memory_not_set: and: - equals: [{get_param: [RoleParameters, OvsDpdkSocketMemory]}, ""] @@ -1106,7 +1111,7 @@ outputs: - {get_attr: [RoleParametersValue, value, nova_permit_post_copy]} - ["TRUE", "true", "True"] - if: - - reserved_huge_pages_set + - live_migration_optimization_set - true - false nova::migration::live_migration_permit_auto_converge: @@ -1116,7 +1121,7 @@ outputs: - {get_attr: [RoleParametersValue, value, nova_permit_auto_converge]} - ["TRUE", "true", "True"] - if: - - reserved_huge_pages_set + - live_migration_optimization_set - true - false