openstack/openstack-helm
Code Issues Proposed changes

Neutron: fix reg exp for finding default tunneling interface

Browse Source 
Grep the output from 'ip route' command matching first word after match.
The OVS was fixed some time ago, but in new linuxbridge the default
tunnel interface was following wrong grep expression.
Making both OVS and linuxbridge to follow the same reg exp.

Change-Id: I222d694b06285d5ec3d848ee157542796dfc1cc7
Closes-Bug: #1700323
This commit is contained in:
Artur Korzeniewski 2017-09-08 09:38:05 +02:00
parent 84eecc457e
commit 4ed7de8f71
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,7 +54,7 @@ tunnel_interface="{{- .Values.network.interface.tunnel -}}"
if [ -z "${tunnel_interface}" ] ; then if [ -z "${tunnel_interface}" ] ; then
# search for interface with default routing # search for interface with default routing
# If there is not default gateway, exit # If there is not default gateway, exit
tunnel_interface=$(ip r | grep default | grep -oP '(?<=dev ).*') || exit 1 tunnel_interface=$(ip route list 0/0 | grep -oP '(?<=dev\s)\w+') || exit 1
fi fi
# determine local-ip dynamically based on interface provided but only if tunnel_types is not null # determine local-ip dynamically based on interface provided but only if tunnel_types is not null

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

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