matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix DHCP Relay Monitor Jinaja2 Template file. (#9655)

Browse Source 
Why I did:

DHCP Relay docker does not start if we don't have v6 DHCP Relay address as this caused jinja2 template generation failure.
This commit is contained in:
abdosi 2022-01-03 12:59:57 -08:00 committed by GitHub
parent 0aab55c28b
commit 3d4b3d5daf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dockers/docker-dhcp-relay/dhcpv6-relay.monitors.j2
View File

@ -38,6 +38,7 @@ dhcpmon-{{ vlan_name }}
{% endif %}
{% endfor %}
{% endif %}
{% if relay_for_ipv4.flag or relay_for_ipv6.flag %}
[program:dhcpmon-{{ vlan_name }}]
{# We treat this VLAN as a downstream interface (-id), as we only want to listen for requests #}
command=/usr/sbin/dhcpmon -id {{ vlan_name }}
@ -58,10 +59,6 @@ command=/usr/sbin/dhcpmon -id {{ vlan_name }}
{% endif %}
{% if relay_for_ipv4.flag %} -4{% endif %}
{% if relay_for_ipv6.flag %} -6{% endif %}
{% if relay_for_ipv4.flag %}
{% set _dummy = relay_for_ipv4.update({'flag': False}) %}
{% if relay_for_ipv6.flag %}
{% set _dummy = relay_for_ipv6.update({'flag': False}) %}
priority=4
autostart=false
@ -73,5 +70,4 @@ stderr_logfile=syslog
{% set _dummy = relay_for_ipv4.update({'flag': False}) %}
{% set _dummy = relay_for_ipv6.update({'flag': False}) %}
{% endif %}
{% endif %}
{% endfor %}