From 888cbc2970e3c06956f1fae403c07743371cae7c Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Thu, 21 Sep 2017 13:28:09 +0100 Subject: [PATCH] Include all rootwrap filters when building wheels The current method of specifying each rootwrap filter in the file list is prone to errors when adding or removing filters. Instead of relying on a manually maintained list this patch just includes all the files of the correct naming convention from the applicable folder. This is simpler and easier to maintain. Closes-Bug: #1718356 Change-Id: I7f8c55f63d1c5a85a6a92062e918426f7d2d3c35 (cherry picked from commit 45f1404c68553fd01f386522dd16841526c68dbf) --- setup.cfg | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/setup.cfg b/setup.cfg index e877576e38f..7b0460b0679 100644 --- a/setup.cfg +++ b/setup.cfg @@ -26,17 +26,7 @@ data_files = etc/api-paste.ini etc/policy.json etc/rootwrap.conf - etc/neutron/rootwrap.d = - etc/neutron/rootwrap.d/debug.filters - etc/neutron/rootwrap.d/dhcp.filters - etc/neutron/rootwrap.d/dibbler.filters - etc/neutron/rootwrap.d/iptables-firewall.filters - etc/neutron/rootwrap.d/ebtables.filters - etc/neutron/rootwrap.d/ipset-firewall.filters - etc/neutron/rootwrap.d/l3.filters - etc/neutron/rootwrap.d/linuxbridge-plugin.filters - etc/neutron/rootwrap.d/netns-cleanup.filters - etc/neutron/rootwrap.d/openvswitch-plugin.filters + etc/neutron/rootwrap.d = etc/neutron/rootwrap.d/* scripts = bin/neutron-rootwrap-xen-dom0