From c9febff961c2d17698a889c5444c6248c6264e9f Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Sat, 20 Feb 2021 11:01:12 -0800 Subject: [PATCH] [radv] Disable radv for specific deployment_id (#6830) --- ...cker-router-advertiser.supervisord.conf.j2 | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2 b/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2 index 5a6416b0ff..d8e4c9ac89 100644 --- a/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2 +++ b/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2 @@ -29,15 +29,18 @@ 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 #} +{# But not for specific deployment_id #} {%- set vlan_v6 = namespace(count=0) -%} -{%- if "ToRRouter" in DEVICE_METADATA.localhost.type and DEVICE_METADATA.localhost.type != "MgmtToRRouter" -%} - {%- 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 -%} +{%- if DEVICE_METADATA.localhost.deployment_id != "8" -%} + {%- if "ToRRouter" in DEVICE_METADATA.localhost.type and DEVICE_METADATA.localhost.type != "MgmtToRRouter" -%} + {%- 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 -%} {%- endif -%}