Merge branch 'devel' into feat/port_channel_interfaces/isis_auth

aristanetworks · Nov 13, 2024 · 746679e · 746679e
2 parents c3023aa + 461a3b7
commit 746679e
Show file tree

Hide file tree

Showing 294 changed files with 6,196 additions and 9,070 deletions.
diff --git a/ansible_collections/arista/avd/.ansible-lint b/ansible_collections/arista/avd/.ansible-lint
@@ -7,4 +7,4 @@ skip_list:
   - meta-no-info # Ansible-lint does not honor meta-schema with standalone: false
   - var-naming[no-role-prefix] # TODO: Fix internal variable names as a breaking change for AVD 5.0.0
 kinds:
-  - yaml: "**/molecule/**/inventory/host_vars/roles.yml"
+  - yaml: "**/molecule/**/inventory/host_vars/host1/roles.yml"
diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/pe1.yml b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/pe1.yml
@@ -241,9 +241,9 @@ router_ospf:
   - id: 10
     vrf: C1_VRF1
     passive_interface_default: true
-    router_id: 10.255.1.1
     no_passive_interfaces:
     - Ethernet3.10
+    router_id: 10.255.1.1
     redistribute:
       bgp:
         enabled: true

diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/pe2.yml b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/pe2.yml
@@ -241,9 +241,9 @@ router_ospf:
   - id: 10
     vrf: C1_VRF1
     passive_interface_default: true
-    router_id: 10.255.1.2
     no_passive_interfaces:
     - Ethernet4.10
+    router_id: 10.255.1.2
     redistribute:
       bgp:
         enabled: true

diff --git a/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/pe3.yml b/ansible_collections/arista/avd/examples/isis-ldp-ipvpn/intended/structured_configs/pe3.yml
@@ -236,9 +236,9 @@ router_ospf:
   - id: 10
     vrf: C1_VRF1
     passive_interface_default: true
-    router_id: 10.255.1.3
     no_passive_interfaces:
     - Ethernet2
+    router_id: 10.255.1.3
     redistribute:
       bgp:
         enabled: true