From 1e4256f2d04da2984fe2e54914360bd1036fce77 Mon Sep 17 00:00:00 2001 From: Moshe Levi Date: Sat, 9 May 2015 19:34:16 +0300 Subject: [PATCH] Move ebrctl to compute.filter. Currently ebrctl is network.filters, but the utility is used by libvirt in nova compute, as part of a Mellanox vif driver. The ubuntu packages install network.filters with the nova-network package. But this vif driver only works with Neutron. To help fix that, this patch move it to compute.filters to ensure it is always installed with Nova. Closes-Bug: #1453418 Change-Id: Ib61a565c10edfa662c15fac339b2cbd9bb673631 --- etc/nova/rootwrap.d/compute.filters | 3 +++ etc/nova/rootwrap.d/network.filters | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/nova/rootwrap.d/compute.filters b/etc/nova/rootwrap.d/compute.filters index acb5b25e4618..726ab90073a5 100644 --- a/etc/nova/rootwrap.d/compute.filters +++ b/etc/nova/rootwrap.d/compute.filters @@ -89,6 +89,9 @@ ovs-vsctl: CommandFilter, ovs-vsctl, root # nova/virt/libvirt/vif.py: 'vrouter-port-control', ... vrouter-port-control: CommandFilter, vrouter-port-control, root +# nova/virt/libvirt/vif.py: 'ebrctl', ... +ebrctl: CommandFilter, ebrctl, root + # nova/network/linux_net.py: 'ovs-ofctl', .... ovs-ofctl: CommandFilter, ovs-ofctl, root diff --git a/etc/nova/rootwrap.d/network.filters b/etc/nova/rootwrap.d/network.filters index 568e8d493cd3..527ab40c2799 100644 --- a/etc/nova/rootwrap.d/network.filters +++ b/etc/nova/rootwrap.d/network.filters @@ -42,9 +42,6 @@ ivs-ctl: CommandFilter, ivs-ctl, root # nova/virt/libvirt/vif.py: 'ifc_ctl', ... ifc_ctl: CommandFilter, /opt/pg/bin/ifc_ctl, root -# nova/virt/libvirt/vif.py: 'ebrctl', ... -ebrctl: CommandFilter, ebrctl, root - # nova/virt/libvirt/vif.py: 'mm-ctl', ... mm-ctl: CommandFilter, mm-ctl, root