openstack
/
neutron
Code Issues Proposed changes

Make path for tcpdump release-specific 

In Ubuntu 22.04, the tcpdump binary is in /usr/bin instead of /usr/sbin,
adapt the path selection accordingly.

Needed-By: https://review.opendev.org/857031
Change-Id: Ida08e0ea98fe1b3dc8b4416101897dabc096fbdf
This commit is contained in:
Dr. Jens Harbott 2022-09-16 11:07:30 +02:00
parent cca48be73d
commit 639257c77b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devstack/plugin.sh
View File

@ -117,7 +117,12 @@ if [[ "$1" == "stack" ]]; then
if is_service_enabled br-ex-tcpdump ; then
# tcpdump monitor on br-ex for ARP, reverse ARP and ICMP v4 / v6 packets
sudo ip link set dev $PUBLIC_BRIDGE up
run_process br-ex-tcpdump "/usr/sbin/tcpdump -i $PUBLIC_BRIDGE arp or rarp or icmp or icmp6 -enlX" "$STACK_GROUP" root
if [[ "$os_CODENAME" == "jammy" ]]; then
TCPDUMP=/usr/bin/tcpdump
else
TCPDUMP=/usr/sbin/tcpdump
fi
run_process br-ex-tcpdump "$TCPDUMP -i $PUBLIC_BRIDGE arp or rarp or icmp or icmp6 -enlX" "$STACK_GROUP" root
fi
if is_service_enabled br-int-flows ; then