Configure qemu when Calico network type is set
Previously the qemu.conf was being configured by the Calico tasks in Neutron, which is improper as Neutron is not managing the libvirt/qemu installation. Change-Id: Id2cfa3353543fecd55f1135abad89f07071e2f60
This commit is contained in:
@@ -47,7 +47,9 @@
|
|||||||
owner: "root"
|
owner: "root"
|
||||||
group: "root"
|
group: "root"
|
||||||
mode: "0600"
|
mode: "0600"
|
||||||
when: qemu_conf_dict is defined
|
when:
|
||||||
|
- qemu_conf_dict is defined
|
||||||
|
or nova_network_type == 'calico'
|
||||||
notify: Restart libvirt-bin
|
notify: Restart libvirt-bin
|
||||||
tags:
|
tags:
|
||||||
- nova-kvm
|
- nova-kvm
|
||||||
|
|||||||
@@ -1,4 +1,20 @@
|
|||||||
# {{ ansible_managed }}
|
# {{ ansible_managed }}
|
||||||
|
|
||||||
|
{% if nova_network_type == 'calico' %}
|
||||||
|
# Calico specific qemu settings
|
||||||
|
# Information available at:
|
||||||
|
# http://docs.projectcalico.org/en/latest/ubuntu-opens-install.html
|
||||||
|
clear_emulator_capabilities = 0
|
||||||
|
user = "root"
|
||||||
|
group = "root"
|
||||||
|
cgroup_device_acl = [
|
||||||
|
"/dev/null", "/dev/full", "/dev/zero",
|
||||||
|
"/dev/random", "/dev/urandom",
|
||||||
|
"/dev/ptmx", "/dev/kvm", "/dev/kqemu",
|
||||||
|
"/dev/rtc", "/dev/hpet", "/dev/net/tun",
|
||||||
|
]
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
{% for key, value in qemu_conf_dict.iteritems() %}
|
{% for key, value in qemu_conf_dict.iteritems() %}
|
||||||
{{ key }} = {{ value }}
|
{{ key }} = {{ value }}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|||||||
Reference in New Issue
Block a user