Merge "Set cpu_mode/cpu_model for E\ models"
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml
index a82008f..16731e3 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml
@@ -47,6 +47,11 @@
port: ${_param:rabbitmq_port}
ssl:
enabled: ${_param:rabbitmq_ssl_enabled}
+ # 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
neutron:
compute:
notification:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
index 0ad9af0..72c1133 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
@@ -50,6 +50,11 @@
port: ${_param:rabbitmq_port}
ssl:
enabled: ${_param:rabbitmq_ssl_enabled}
+ # 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
neutron:
compute:
notification:
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml
index deeb36d..9a227d1 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml
@@ -25,6 +25,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
neutron:
compute:
notification:
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