Skip to content

Commit e73c143

Browse files
LijoJosxwjiang-ms
authored andcommitted
Removing deployment id filter from router advertiser (sonic-net#24785)
Why I did it Removed Deployment id filter from router advertiser so as to enable IPV6 Router Advertiser on all TOR (T0) devices for all deployments which have at least one vlan interface Work item tracking Microsoft ADO (number only): 32212243 How I did it Removed Deployment id filter Signed-off-by: xiaweijiang <[email protected]>
1 parent e6fe846 commit e73c143

1 file changed

Lines changed: 10 additions & 13 deletions

File tree

dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,17 @@ dependent_startup=true
4444
dependent_startup_wait_for=rsyslogd:running
4545

4646
{# Router advertiser should only run on ToR (T0) devices which have #}
47-
{# at least one VLAN interface which has an IPv6 address asigned #}
48-
{# But not for specific deployment_id #}
47+
{# at least one VLAN interface which has an IPv6 address assigned #}
4948
{%- set vlan_v6 = namespace(count=0) -%}
50-
{%- if DEVICE_METADATA.localhost.deployment_id != "8" -%}
51-
{%- if DEVICE_METADATA.localhost.type -%}
52-
{%- if "ToRRouter" in DEVICE_METADATA.localhost.type or DEVICE_METADATA.localhost.type in ["EPMS", "MgmtTsToR"] -%}
53-
{%- if VLAN_INTERFACE -%}
54-
{%- for (name, prefix) in VLAN_INTERFACE|pfx_filter -%}
55-
{# If this VLAN has an IPv6 address... #}
56-
{%- if prefix | ipv6 -%}
57-
{%- set vlan_v6.count = vlan_v6.count + 1 -%}
58-
{%- endif -%}
59-
{%- endfor -%}
60-
{%- endif -%}
49+
{%- if DEVICE_METADATA.localhost.type -%}
50+
{%- if "ToRRouter" in DEVICE_METADATA.localhost.type or DEVICE_METADATA.localhost.type in ["EPMS", "MgmtTsToR"] -%}
51+
{%- if VLAN_INTERFACE -%}
52+
{%- for (name, prefix) in VLAN_INTERFACE|pfx_filter -%}
53+
{# If this VLAN has an IPv6 address... #}
54+
{%- if prefix | ipv6 -%}
55+
{%- set vlan_v6.count = vlan_v6.count + 1 -%}
56+
{%- endif -%}
57+
{%- endfor -%}
6158
{%- endif -%}
6259
{%- endif -%}
6360
{%- endif -%}

0 commit comments

Comments
 (0)