Merge branch 'devel' into cli-restructure-part2

aristanetworks · Nov 13, 2024 · 9acbf3c · 9acbf3c
2 parents 839d99d + 48a0b7e
commit 9acbf3c
Show file tree

Hide file tree

Showing 408 changed files with 12,071 additions and 15,396 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/docs/porting-guides/5.x.x.md b/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md
@@ -833,7 +833,7 @@ To retain the previous behavior, set the value to `false`:
 + shutdown_interfaces_towards_undeployed_peers: false
 ```
 
-### BGP is now configured for Network services VRFs even if 'evpn' is not part of the address-families
+### BGP is now configured for Network services VRFs even if `evpn` is not part of the address-families
 
 AVD versions below 5.0.0 did not generate BGP configuration for VRFs unless the node type included `evpn`, `vpn-ipv4` or `vpn-ipv6` under `default_overlay_address_families` *and* the
 VRF had the same `evpn`, `vpn-ipv4` or `vpn-ipv6` defined under `address_families` (default is `['evpn']`).

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

diff --git a/...ions/arista/avd/molecule/eos_cli_config_gen/documentation/devices/errdisable.md b/...ions/arista/avd/molecule/eos_cli_config_gen/documentation/devices/errdisable.md