fix rootwrap debug filter for ping all

NeutronDebugAgent.ping_all calls ping with "-c 1 -w <number>' so
the filter should accept this order, and not only "-w .. -c ..".

Not changing the existing filter to not break other tools
that might use -w -c in that order.

Change-Id: I5b3d67dfcdc15c53ac3bf2fb39de29fd97e98a19

diff --git a/etc/neutron/rootwrap.d/debug.filters b/etc/neutron/rootwrap.d/debug.filters
index b61d9601780d870a8c481401d44b7d435ae0bf1f..8d72ce2b1e38da31e40b0de5a9744e7409267958 100644 (file)
--- a/etc/neutron/rootwrap.d/debug.filters
+++ b/etc/neutron/rootwrap.d/debug.filters
@@ -10,5 +10,9 @@
 
 # This is needed because we should ping
 # from inside a namespace which requires root
+# _alt variants allow to match -c and -w in any order
+#   (used by NeutronDebugAgent.ping_all)
 ping: RegExpFilter, ping, root, ping, -w, \d+, -c, \d+, [0-9\.]+
+ping_alt: RegExpFilter, ping, root, ping, -c, \d+, -w, \d+, [0-9\.]+
 ping6: RegExpFilter, ping6, root, ping6, -w, \d+, -c, \d+, [0-9A-Fa-f:]+
+ping6_alt: RegExpFilter, ping6, root, ping6, -c, \d+, -w, \d+, [0-9A-Fa-f:]+
\ No newline at end of file