openstack/kolla-ansible
Code Issues Proposed changes

Merge "CI: Use libvirt/cpu_models instead of cpu_model"

Browse Source
This commit is contained in:
Zuul 2023-02-21 15:41:36 +00:00 committed by Gerrit Code Review
commit ff4c65b892
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/templates/nova-compute-overrides.j2
View File

@ -2,7 +2,7 @@
{% if ansible_architecture == 'aarch64' %} {% if ansible_architecture == 'aarch64' %}
cpu_mode = custom cpu_mode = custom
# cpu_model=max fails to boot multiple images with QEMU 7.0 and -M virt (works with "-M virt-6.2") # cpu_model=max fails to boot multiple images with QEMU 7.0 and -M virt (works with "-M virt-6.2")
cpu_model=cortex-a72 cpu_models = cortex-a72
{% elif ansible_architecture == 'x86_64' %} {% elif ansible_architecture == 'x86_64' %}
# RHEL 9 are being compiled for the x86_64-v2 architecture which is # RHEL 9 are being compiled for the x86_64-v2 architecture which is
# newer than the qemu default of qemu64. Nehalem is apparently the # newer than the qemu default of qemu64. Nehalem is apparently the
@ -10,6 +10,6 @@ cpu_model=cortex-a72
# Intel and AMD cpus with kvm or qemu. # Intel and AMD cpus with kvm or qemu.
{% if virt_type == 'kvm' %} {% if virt_type == 'kvm' %}
cpu_mode = custom cpu_mode = custom
cpu_model=Nehalem cpu_models = Nehalem
{% endif %} {% endif %}
{% endif %} {% endif %}