diff --git a/defaults/main.yml b/defaults/main.yml index c31b776a..539bb489 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -319,9 +319,6 @@ nova_network_services: use_forwarded_for: True metadata_proxy_enabled: True ovs_bridge: alubr0 - calico: - use_forwarded_for: True - metadata_proxy_enabled: False nsx: use_forwarded_for: True metadata_proxy_enabled: True diff --git a/tasks/drivers/kvm/nova_compute_kvm.yml b/tasks/drivers/kvm/nova_compute_kvm.yml index f0be3cd7..cb663200 100644 --- a/tasks/drivers/kvm/nova_compute_kvm.yml +++ b/tasks/drivers/kvm/nova_compute_kvm.yml @@ -86,7 +86,6 @@ mode: "0600" when: - _nova_qemu_conf | length > 0 - or nova_network_type == 'calico' notify: Restart libvirt-bin tags: - nova-config diff --git a/templates/qemu.conf.j2 b/templates/qemu.conf.j2 index ba79ec8d..117fddbf 100644 --- a/templates/qemu.conf.j2 +++ b/templates/qemu.conf.j2 @@ -1,20 +1,5 @@ # {{ 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 %} - {% if nova_libvirtd_listen_tls == 1 %} # Use of TLS requires that x509 certificates be issued. The default is # to keep them in /etc/pki/qemu. This directory must contain