Merge pull request #29 from PacketAnglers/avd-4.0

Updates for AVD 4.0
aristanetworks · Jun 23, 2023 · 8f8b5db · 8f8b5db
2 parents b70563a + 0da6e06
commit 8f8b5db
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 44 deletions.
diff --git a/ansible.cfg b/ansible.cfg
@@ -33,6 +33,9 @@ forks = 15
 # Disable cowsay (Why?)
 nocows = True
 
+# Disable deprecation warnings, more readable output
+deprecation_warnings = False
+
 [paramiko_connection]
 # Automatically add the keys of target hosts to known hosts
 host_key_auto_add = True

diff --git a/global_vars/global_dc_vars.yml b/global_vars/global_dc_vars.yml
@@ -13,10 +13,12 @@ ansible_httpapi_port: 443
 ansible_httpapi_use_ssl: true
 ansible_httpapi_validate_certs: false
 ansible_python_interpreter: $(which python3)
+avd_data_conversion_mode: error
+avd_data_validation_mode: error
 
 # Local Users
 local_users:
-  arista:
+  - name: arista
     privilege: 15
     role: network-admin
     sha512_password: "{{ ansible_password | password_hash(salt='workshop') }}"

diff --git a/requirements.yml b/requirements.yml
@@ -2,7 +2,7 @@
 collections:
 
   - name: arista.avd
-    version: 3.8.4
+    version: 4.1.0
 
   - name: arista.cvp
     version: 3.6.1

diff --git a/sites/site_1/group_vars/SITE1_FABRIC.yml b/sites/site_1/group_vars/SITE1_FABRIC.yml
@@ -17,12 +17,12 @@ l3spine:
     virtual_router_mac_address: 00:1c:73:00:dc:01
     mlag_interfaces: [ Ethernet1, Ethernet6 ]
   node_groups:
-    SPINES:
+    - group: SPINES
       nodes:
-        s1-spine1:
+        - name: s1-spine1
           id: 1
           mgmt_ip: 192.168.0.10/24
-        s1-spine2:
+        - name: s1-spine2
           id: 2
           mgmt_ip: 192.168.0.11/24
 
@@ -37,27 +37,27 @@ leaf:
     uplink_interfaces: [ Ethernet2, Ethernet3 ]
     mlag_interfaces: [ Ethernet1, Ethernet6 ]
   node_groups:
-    RACK1:
+    - group: RACK1
       filter:
         tags: [ "Web" ]
       nodes:
-        s1-leaf1:
+        - name: s1-leaf1
           id: 3
           mgmt_ip: 192.168.0.12/24
           uplink_switch_interfaces: [ Ethernet2, Ethernet2 ]
-        s1-leaf2:
+        - name: s1-leaf2
           id: 4
           mgmt_ip: 192.168.0.13/24
           uplink_switch_interfaces: [ Ethernet3, Ethernet3 ]
-    RACK2:
+    - group: RACK2
       filter:
         tags: [ "App" ]
       nodes:
-        s1-leaf3:
+        - name: s1-leaf3
           id: 5
           mgmt_ip: 192.168.0.14/24
           uplink_switch_interfaces: [ Ethernet4, Ethernet4 ]
-        s1-leaf4:
+        - name: s1-leaf4
           id: 6
           mgmt_ip: 192.168.0.15/24
           uplink_switch_interfaces: [ Ethernet5, Ethernet5 ]

diff --git a/sites/site_1/group_vars/SITE1_FABRIC_PORTS.yml b/sites/site_1/group_vars/SITE1_FABRIC_PORTS.yml
@@ -1,10 +1,11 @@
+---
 port_profiles:
 
-  PP-VLAN10:
+  - profile: PP-VLAN10
     mode: "access"
     vlans: "10"
     spanning_tree_portfast: edge
-  PP-VLAN20:
+  - profile: PP-VLAN20
     mode: "access"
     vlans: "20"
     spanning_tree_portfast: edge
@@ -19,7 +20,7 @@ port_profiles:
 # # Site1 RACK1 Endpoints
 # # --------------------------------------------------------#
 
-#   s1-host1:                                             # Server name
+#   - name: s1-host1                                      # Server name
 #     rack: RACK1                                         # Informational RACK (optional)
 #     adapters:
 #       - endpoint_ports: [ eth1, eth2 ]                  # Server port to connect (optional)
@@ -33,7 +34,7 @@ port_profiles:
 # # Site1 RACK2 Endpoints
 # # --------------------------------------------------------#
 
-#   s1-host2:                                             # Server name
+#   - name: s1-host2                                      # Server name
 #     rack: RACK2                                         # Informational RACK (optional)
 #     adapters:
 #       - endpoint_ports: [ eth1, eth2 ]                  # Server port to connect (optional)

diff --git a/sites/site_1/group_vars/SITE1_FABRIC_SERVICES.yml b/sites/site_1/group_vars/SITE1_FABRIC_SERVICES.yml
@@ -1,28 +1,28 @@
 # ---
 # tenants:
-#   MY_FABRIC:
+#   - name: MY_FABRIC
 #     vrfs:
-#       default:
+#       - name: default
 #         svis:
-#           10:
+#           - id: 10
 #             name: 'Ten'
 #             tags: [ "Web" ]
 #             enabled: true
 #             ip_virtual_router_addresses:
 #               - 10.10.10.1
 #             nodes:
-#               s1-spine1:
+#               - node: s1-spine1
 #                 ip_address: 10.10.10.2/24
-#               s1-spine2:
+#               - node: s1-spine2
 #                 ip_address: 10.10.10.3/24
-#           20:
+#           - id: 20
 #             name: 'Twenty'
 #             tags: [ "App" ]
 #             enabled: true
 #             ip_virtual_router_addresses:
 #               - 10.20.20.1
 #             nodes:
-#               s1-spine1:
+#               - node: s1-spine1
 #                 ip_address: 10.20.20.2/24
-#               s1-spine2:
+#               - node: s1-spine2
 #                 ip_address: 10.20.20.3/24
diff --git a/sites/site_2/group_vars/SITE2_FABRIC.yml b/sites/site_2/group_vars/SITE2_FABRIC.yml
@@ -17,12 +17,12 @@ l3spine:
     virtual_router_mac_address: 00:1c:73:00:dc:01
     mlag_interfaces: [ Ethernet1, Ethernet6 ]
   node_groups:
-    SPINES:
+    - group: SPINES
       nodes:
-        s2-spine1:
+        - name: s2-spine1
           id: 1
           mgmt_ip: 192.168.0.20/24
-        s2-spine2:
+        - name: s2-spine2
           id: 2
           mgmt_ip: 192.168.0.21/24
 
@@ -37,27 +37,27 @@ leaf:
     uplink_interfaces: [ Ethernet2, Ethernet3 ]
     mlag_interfaces: [ Ethernet1, Ethernet6 ]
   node_groups:
-    RACK1:
+    - group: RACK1
       filter:
         tags: [ "DB" ]
       nodes:
-        s2-leaf1:
+        - name: s2-leaf1
           id: 3
           mgmt_ip: 192.168.0.22/24
           uplink_switch_interfaces: [ Ethernet2, Ethernet2 ]
-        s2-leaf2:
+        - name: s2-leaf2
           id: 4
           mgmt_ip: 192.168.0.23/24
           uplink_switch_interfaces: [ Ethernet3, Ethernet3 ]
-    RACK2:
+    - group: RACK2
       filter:
         tags: [ "DMZ" ]
       nodes:
-        s2-leaf3:
+        - name: s2-leaf3
           id: 5
           mgmt_ip: 192.168.0.24/24
           uplink_switch_interfaces: [ Ethernet4, Ethernet4 ]
-        s2-leaf4:
+        - name: s2-leaf4
           id: 6
           mgmt_ip: 192.168.0.25/24
           uplink_switch_interfaces: [ Ethernet5, Ethernet5 ]

diff --git a/sites/site_2/group_vars/SITE2_FABRIC_PORTS.yml b/sites/site_2/group_vars/SITE2_FABRIC_PORTS.yml
@@ -1,10 +1,11 @@
+---
 port_profiles:
 
-  PP-VLAN30:
+  - profile: PP-VLAN30
     mode: "access"
     vlans: "30"
     spanning_tree_portfast: edge
-  PP-VLAN40:
+  - profile: PP-VLAN40
     mode: "access"
     vlans: "40"
     spanning_tree_portfast: edge
@@ -19,7 +20,7 @@ port_profiles:
 # # Site2 RACK1 Endpoints
 # # --------------------------------------------------------#
 
-#   s2-host1:                                             # Server name
+#   - name: s2-host1                                      # Server name
 #     rack: RACK1                                         # Informational RACK (optional)
 #     adapters:
 #       - endpoint_ports: [ eth1, eth2 ]                  # Server port to connect (optional)
@@ -33,7 +34,7 @@ port_profiles:
 # # Site2 RACK2 Endpoints
 # # --------------------------------------------------------#
 
-#   s2-host2:                                             # Server name
+#   - name: s2-host2                                      # Server name
 #     rack: RACK2                                         # Informational RACK (optional)
 #     adapters:
 #       - endpoint_ports: [ eth1, eth2 ]                  # Server port to connect (optional)

diff --git a/sites/site_2/group_vars/SITE2_FABRIC_SERVICES.yml b/sites/site_2/group_vars/SITE2_FABRIC_SERVICES.yml
@@ -1,28 +1,28 @@
 # ---
 # tenants:
-#   MY_FABRIC:
+#   - name: MY_FABRIC
 #     vrfs:
-#       default:
+#       - name: default
 #         svis:
-#           30:
+#           - id: 30
 #             name: 'Thirty'
 #             tags: [ "DB" ]
 #             enabled: true
 #             ip_virtual_router_addresses:
 #               - 10.30.30.1
 #             nodes:
-#               s2-spine1:
+#               - node: s2-spine1
 #                 ip_address: 10.30.30.2/24
-#               s2-spine2:
+#               - node: s2-spine2
 #                 ip_address: 10.30.30.3/24
-#           40:
+#           - id: 40
 #             name: 'Forty'
 #             tags: [ "DMZ" ]
 #             enabled: true
 #             ip_virtual_router_addresses:
 #               - 10.40.40.1
 #             nodes:
-#               s2-spine1:
+#               - node: s2-spine1
 #                 ip_address: 10.40.40.2/24
-#               s2-spine2:
+#               - node: s2-spine2
 #                 ip_address: 10.40.40.3/24