openstack/openstack-helm
Code Issues Proposed changes

Merge "Fix OVS tunnel interface grep"

Browse Source
This commit is contained in:
Jenkins 2017-07-13 13:28:19 +00:00 committed by Gerrit Code Review
commit 956cf735d1
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 -}}" 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 r | grep default | grep -oP '(?<=dev ).*') tunnel_interface=$(ip route | awk '/^default/ { print $5 }' | head -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