openstack/kolla-ansible
Code Issues Proposed changes

Merge "nova: set libvirt/cpu_mode on aarch64 to working value"

Browse Source
This commit is contained in:
Zuul 2018-01-03 16:53:42 +00:00 committed by Gerrit Code Review
commit 83ba36c5fd
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/roles/nova/defaults/main.yml
View File

@ -173,6 +173,7 @@ nova_tag: "{{ openstack_release }}"
nova_libvirt_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ nova_install_type }}-nova-libvirt"
nova_libvirt_tag: "{{ nova_tag }}"
nova_libvirt_image_full: "{{ nova_libvirt_image }}:{{ nova_libvirt_tag }}"
nova_libvirt_cpu_mode: "{{ 'host-passthrough' if ansible_architecture == 'aarch64' else '' }}"
nova_ssh_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ nova_install_type }}-nova-ssh"
nova_ssh_tag: "{{ nova_tag }}"

3
ansible/roles/nova/templates/nova.conf.j2
View File

@ -186,6 +186,9 @@ rbd_secret_uuid = {{ rbd_secret_uuid }}
{% endif %}
virt_type = {{ nova_compute_virt_type }}
{% endif %}
{% if nova_libvirt_cpu_mode %}
cpu_mode = {{ nova_libvirt_cpu_mode }}
{% endif %}
{% if nova_compute_virt_type == "vmware" %}
[vmware]