1ee4fa5a40
**- Why I did it** PR https://github.com/Azure/sonic-buildimage/pull/4599 introduced two bugs in the startup of the router advertiser container: 1. References to the `wait_for_intf.sh` script were changed to `wait_for_link.sh`, but the actual script was not renamed 2. The `ipv6_found` Jinja2 variable added to the supervisor config file goes out of scope before it is read. **- How I did it** 1. Rename the `wait_for_intf.sh` script to `wait_for_link.sh` 2. Use the Jinja2 "namespace" construct to fix the scope issue **- How to verify it** Ensure all processes in the radv container start properly under the correct conditions (i.e., whether or not there is at least one VLAN with an IPv6 address assigned).
65 lines
1.5 KiB
Django/Jinja
65 lines
1.5 KiB
Django/Jinja
[supervisord]
|
|
logfile_maxbytes=1MB
|
|
logfile_backups=2
|
|
nodaemon=true
|
|
|
|
[eventlistener:dependent-startup]
|
|
command=python -m supervisord_dependent_startup
|
|
autostart=true
|
|
autorestart=unexpected
|
|
startretries=0
|
|
exitcodes=0,3
|
|
events=PROCESS_STATE
|
|
|
|
[eventlistener:supervisor-proc-exit-script]
|
|
command=/usr/bin/supervisor-proc-exit-listener --container-name radv
|
|
events=PROCESS_STATE_EXITED
|
|
autostart=true
|
|
autorestart=unexpected
|
|
|
|
[program:rsyslogd]
|
|
command=/usr/sbin/rsyslogd -n -iNONE
|
|
priority=1
|
|
autostart=false
|
|
autorestart=false
|
|
stdout_logfile=syslog
|
|
stderr_logfile=syslog
|
|
dependent_startup=true
|
|
|
|
{# Router advertiser should only run on ToR (T0) devices which have #}
|
|
{# at least one VLAN interface which has an IPv6 address asigned #}
|
|
{%- set vlan_v6 = namespace(count=0) -%}
|
|
{%- if DEVICE_METADATA.localhost.type == "ToRRouter" -%}
|
|
{%- if VLAN_INTERFACE -%}
|
|
{%- for (name, prefix) in VLAN_INTERFACE|pfx_filter -%}
|
|
{# If this VLAN has an IPv6 address... #}
|
|
{%- if prefix | ipv6 -%}
|
|
{%- set vlan_v6.count = vlan_v6.count + 1 -%}
|
|
{%- endif -%}
|
|
{%- endfor -%}
|
|
{%- endif -%}
|
|
{%- endif -%}
|
|
|
|
{%- if vlan_v6.count > 0 %}
|
|
[program:wait_for_link]
|
|
command=/usr/bin/wait_for_link.sh
|
|
priority=3
|
|
autostart=false
|
|
autorestart=false
|
|
startsecs=0
|
|
stdout_logfile=syslog
|
|
stderr_logfile=syslog
|
|
dependent_startup=true
|
|
dependent_startup_wait_for=rsyslogd:running
|
|
|
|
[program:radvd]
|
|
command=/usr/sbin/radvd -n
|
|
priority=4
|
|
autostart=false
|
|
autorestart=false
|
|
stdout_logfile=syslog
|
|
stderr_logfile=syslog
|
|
dependent_startup=true
|
|
dependent_startup_wait_for=wait_for_link:exited
|
|
{% endif -%}
|