openstack/octavia
Code Issues Proposed changes

Merge "Fix an failure if the vip network has no gateway"

Browse Source
This commit is contained in:
Jenkins
2017-05-02 22:17:59 +00:00
committed by Gerrit Code Review
parent a59ec9b9bd c8edfa9a90
commit ad9cdba998
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
octavia/amphorae/backends/agent/api_server/templates/plug_vip_ethX.conf.j2
View File

@@ -21,7 +21,9 @@ iface {{ interface }} inet{{ '6' if vrrp_ipv6 }} static
address {{ vrrp_ip }}
broadcast {{ broadcast }}
netmask {{ netmask }}
{%- if gateway %}
gateway {{ gateway }}
{%- endif %}
{%- if mtu %}
mtu {{ mtu }}
{%- endif %}

4
octavia/amphorae/backends/agent/api_server/templates/rh_plug_vip_ethX.conf.j2
View File

@@ -26,7 +26,9 @@ IPV6INIT="yes"
IPV6_DEFROUTE="yes"
IPV6_AUTOCONF="no"
IPV6ADDR="{{ vrrp_ip }}/{{ prefix }}"
{%- if gateway %}
IPV6_DEFAULTGW="{{ gateway }}"
{%- endif %}
{%- if mtu %}
IPV6_MTU="{{ mtu }}"
{%- endif %}
@@ -34,7 +36,9 @@ IPV6_MTU="{{ mtu }}"
BOOTPROTO="static"
IPADDR="{{ vrrp_ip }}"
NETMASK="{{ netmask }}"
{%- if gateway %}
GATEWAY="{{ gateway }}"
{%- endif %}
MTU="{{ mtu }}"
{%- endif %} {# end if vrrp_ipv6 #}
{%- else %} {# not vrrp_ip #}