Revert "Revert "Set cpu_mode/cpu_model for E\ models""
This reverts commit d34bbc5419b12135de16038b4b13758f3ab615eb.
Change-Id: If92b128a83ba6b336a5f2a774201c5ac59ebf0f2
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml
index a7817f4..3fd3bce 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml
@@ -37,6 +37,11 @@
- host: ${_param:openstack_control_node01_address}
- host: ${_param:openstack_control_node02_address}
- host: ${_param:openstack_control_node03_address}
+ # Compute nodes on devcloud can have different CPUs, we need this
+ # to make sure live migration always work even when cmp VMs are on different computes
+ cpu_mode: custom
+ libvirt:
+ cpu_model: kvm64
linux:
network:
bridge: openvswitch