Remove unused sonic_vrfs configuration

metal-stack · May 23, 2024 · 84eb87d · 84eb87d
1 parent 80e9733
commit 84eb87d
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 25 deletions.
diff --git a/partition/roles/sonic/README.md b/partition/roles/sonic/README.md
@@ -85,9 +85,6 @@ It depends on the `switch_facts` module from `ansible-common`, so make sure modu
 | sonic_sag.vlans                                            |           | A list of VLANs that use SAG                                                                                         |
 | sonic_sag.vlans.id                                         |           | The VLAN ID of this VLAN                                                                                             |
 | sonic_sag.vlans.ip                                         |           | The SAG IP of this VLAN                                                                                              |
-| sonic_vrfs                                                 |           | Static vrf configuration                                                                                             |
-| sonic_vrfs.id                                              |           | The id of this vrf                                                                                                   |
-| sonic_vrfs.vni                                             |           | The vni number of this vrf                                                                                           |
 | sonic_ssh_sourceranges                                     |           | The source ranges from which the switch should be reachable over SSH on its prod (non-management) addresses          |
 | sonic_extended_cacl.ipv4                                   |           | Iptables ipv4 rules that should be added as extended Control Plane ACLs (Edgecore Sonic specific feature)            |
 | sonic_extended_cacl.ipv6                                   |           | Iptables ipv6 rules that should be added as extended Control Plane ACLs (Edgecore Sonic specific feature)            |
diff --git a/partition/roles/sonic/templates/frr.conf.j2 b/partition/roles/sonic/templates/frr.conf.j2
@@ -18,14 +18,6 @@ vrf {{ i.vrf }}
 exit-vrf
 {% endif %}
 {% endfor %}
-{% if sonic_vrfs is defined and sonic_vrfs|length > 0 %}
-{% for vrf in sonic_vrfs %}
-!
-vrf Vrf{{ vrf.id }}
- vni {{ vrf.vni }}
-exit-vrf
-{% endfor %}
-{% endif %}
 {% for port in sonic_bgp_ports %}
 !
 interface {{ port }}
@@ -205,4 +197,4 @@ ip route {{ route }}
 {% endif %}
 !
 line vty
-!
+!
diff --git a/partition/roles/sonic/templates/metal.yaml.j2 b/partition/roles/sonic/templates/metal.yaml.j2
@@ -214,7 +214,7 @@ VXLAN_TUNNEL_MAP:
     vni: "{{ vtep.vni }}"
 {% endfor %}
 {% endif %}
-{% if ( sonic_interconnects is defined and sonic_interconnects|length > 0 ) or ( sonic_vrfs is defined and sonic_vrfs|length > 0 )%}
+{% if sonic_interconnects is defined and sonic_interconnects|length > 0 %}
 
 VRF:
 {% endif %}
@@ -230,12 +230,6 @@ VRF:
   {% endif %}
 {% endfor %}
 {% endif %}
-{% if sonic_vrfs is defined and sonic_vrfs|length > 0 %}
-{% for vrf in sonic_vrfs %}
-  Vrf{{ vrf.id }}:
-    vni: "{{ vrf.vni }}"
-{% endfor %}
-{% endif %}
 {% if sonic_lldp_hello_timer is defined %}
 
 LLDP:

diff --git a/partition/roles/sonic/test/data/l2_leaf/input.yaml b/partition/roles/sonic/test/data/l2_leaf/input.yaml
@@ -147,11 +147,6 @@ sonic_vteps:
   vlan: Vlan1001
   vni: 46
 
-
-# sonic_vrfs: # TODO figure out if we need this or whether we can create the routing info for l2 leaves with sonic_interconnects
-# - id: 46
-#   vni: 46
-
 sonic_interconnects:
   croit:
     vrf: Vrf46
@@ -217,4 +212,4 @@ sonic_frr_route_map:
 
 sonic_ssh_sourceranges:
 - "1.2.3.4/32"
-- "10.11.0.0/16"
+- "10.11.0.0/16"