openstack/openstack-helm
Code Issues Proposed changes

Fix OVS tunnel interface grep

Browse Source 
Hardened the grep/awk that extracts the default interface for use
as the tunneling interface.  The command failed on multiple
Ubuntu machines as-was.

Change-Id: Ib7d0a8e55e67391d6cb7a58910cfc2ed617a4cbc
This commit is contained in:
Matt McEuen 2017-07-12 21:00:22 -05:00
parent 7ac9adb7ad
commit 6b917043c6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl
View File

@ -30,7 +30,7 @@ timeout 3m neutron-sanity-check --config-file /etc/neutron/neutron.conf --config
tunnel_interface="{{- .Values.network.interface.tunnel -}}"
if [ -z "${tunnel_interface}" ] ; then
# search for interface with default routing
tunnel_interface=$(ip r | grep default | grep -oP '(?<=dev ).*')
tunnel_interface=$(ip route | awk '/^default/ { print $5 }' | head -1 )
fi
# determine local-ip dynamically based on interface provided but only if tunnel_types is not null