openstack/openstack-helm
Code Issues Proposed changes

Merge "Neutron: Update tunnel interface loaction logic"

Browse Source
This commit is contained in:
Jenkins 2017-10-10 19:34:40 +00:00 committed by Gerrit Code Review
commit 749a13f1ce
2 changed files with 3 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 route list 0/0 | grep -oP '(?<=dev\s)\w+') || exit 1 tunnel_interface=$(ip -4 route list 0/0 | awk -F 'dev' '{ print $2; exit }' | awk '{ print $1 }') || 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

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

@ -32,7 +32,8 @@ 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 list 0/0 | grep -oP '(?<=dev\s)\w+') # If there is not default gateway, exit
tunnel_interface=$(ip -4 route list 0/0 | awk -F 'dev' '{ print $2; exit }' | awk '{ print $1 }') || 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