This logic has been tied to OVS since it was introduced in [1] and
revised in [2]. However, many other backends may use tap devices that
aren't related to OVS, such as Calico[3] and Linux Bridge after [4]
merges.
This patch just removes the dependency on OVS specifically so
/dev/net/tun is added to cgroups whenever any Neutron backend is used.
This is done in other deployment tools like Juju[5] so it's not
unprecedented.
1. Ifab268f739b004db13024633e8abeb17691b9e46
2. Ic1da132fa421f1c70c10a319ee3239831b0f956f
3.
http://docs.projectcalico.org/master/getting-started/openstack/installation/ubuntu#compute-node-install
4. I23c5faaeab69aede1fd038a36f4a0b8f928498ce
5.
https://github.com/openstack/charm-nova-compute/blob/2790f81ecd32d9962617c4c3126621fffdc318a0/templates/qemu.conf
Change-Id: I075595158d8f3b5a6811c4794aa7b91912940db5
Partial-Bug: #1675343
| ... | ... |
@@ -98,7 +98,7 @@ function install_libvirt {
|
| 98 | 98 |
# Configures the installed libvirt system so that is accessible by |
| 99 | 99 |
# STACK_USER via qemu:///system with management capabilities. |
| 100 | 100 |
function configure_libvirt {
|
| 101 |
- if is_service_enabled neutron && is_neutron_ovs_base_plugin && ! sudo grep -q '^cgroup_device_acl' $QEMU_CONF; then |
|
| 101 |
+ if is_service_enabled neutron && ! sudo grep -q '^cgroup_device_acl' $QEMU_CONF; then |
|
| 102 | 102 |
# Add /dev/net/tun to cgroup_device_acls, needed for type=ethernet interfaces |
| 103 | 103 |
cat <<EOF | sudo tee -a $QEMU_CONF |
| 104 | 104 |
cgroup_device_acl = [ |