Merge "Explicitly set KVM machine_type for migration compatibility"

puppet/services/nova-compute.yaml

@@ -206,6 +206,13 @@ parameters:
     type: boolean
     tags:
       - role_specific
+  NovaHWMachineType:
+    description: >
+      To specify a default machine type per host architecture.
+    default: 'x86_64=pc-i440fx-rhel7.6.0,aarch64=virt-rhel7.6.0,ppc64=pseries-rhel7.6.0,ppc64le=pseries-rhel7.6.0'
+    type: string
+    tags:
+      - role_specific
 
 conditions:
   enable_live_migration_tunnelled:
@@ -249,6 +256,7 @@ resources:
               nova::compute::libvirt::tx_queue_size: NovaLibvirtTxQueueSize
               nova::compute::libvirt::file_backed_memory: NovaLibvirtFileBackedMemory
               nova::compute::libvirt::volume_use_multipath: NovaLibvirtVolumeUseMultipath
+              nova::compute::libvirt::libvirt_hw_machine_type: NovaHWMachineType
             - values: {get_param: [RoleParameters]}
           - values:
               NovaVcpuPinSet: {get_param: NovaVcpuPinSet}
@@ -261,6 +269,7 @@ resources:
               NovaLibvirtTxQueueSize: {get_param: NovaLibvirtTxQueueSize}
               NovaLibvirtFileBackedMemory: {get_param: NovaLibvirtFileBackedMemory}
               NovaLibvirtVolumeUseMultipath: {get_param: NovaLibvirtVolumeUseMultipath}
+              NovaHWMachineType: {get_param: NovaHWMachineType}
 
 outputs:
   role_data:

releasenotes/notes/hw-machine-type-6a0bd7bc3973c15a.yaml

@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    Add parameter `NovaHWMachineType` which allows to explicitly
+    set machine_type across all compute nodes during deployment,
+    to allow migration compatibility from compute nodes with higher
+    host OS version to compute nodes with lower host OS version.