diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 9610d0d..b59dc2e 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,4 +1,4 @@ { "name": "AVD Universal", - "image": "ghcr.io/aristanetworks/ansible-avd/universal:python3.11-avd-devel", + "image": "ghcr.io/aristanetworks/ansible-avd/universal:python3.11-avd-devel" } diff --git a/datacenter/act/act-inventory.yml b/datacenter/act/act-inventory.yml new file mode 100644 index 0000000..38107d9 --- /dev/null +++ b/datacenter/act/act-inventory.yml @@ -0,0 +1,314 @@ +--- +all: + children: + CVP: + hosts: + act_cv: + ansible_httpapi_host: 10.18.156.170 + ansible_host: 10.18.156.170 + ansible_user: cvpadmin + ansible_password: cvp123! + VEOS: + hosts: + A-LEAF1: + ansible_host: 10.18.156.241 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + A-LEAF2: + ansible_host: 10.18.156.184 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + A-LEAF3: + ansible_host: 10.18.156.212 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + A-LEAF4: + ansible_host: 10.18.156.179 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + A-LEAF5: + ansible_host: 10.18.156.186 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + A-LEAF6: + ansible_host: 10.18.156.230 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + A-LEAF7: + ansible_host: 10.18.156.229 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + A-LEAF8: + ansible_host: 10.18.156.204 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + A-SPINE1: + ansible_host: 10.18.156.222 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + A-SPINE2: + ansible_host: 10.18.156.224 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + A-SPINE3: + ansible_host: 10.18.156.198 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + A-SPINE4: + ansible_host: 10.18.156.180 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + A1: + ansible_host: 10.18.156.240 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + A2: + ansible_host: 10.18.156.200 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + A3: + ansible_host: 10.18.156.236 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + A4: + ansible_host: 10.18.156.189 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + A5: + ansible_host: 10.18.156.195 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + A6: + ansible_host: 10.18.156.172 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + B-LEAF1: + ansible_host: 10.18.156.243 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + B-LEAF2: + ansible_host: 10.18.156.209 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + B-LEAF3: + ansible_host: 10.18.156.239 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + B-LEAF4: + ansible_host: 10.18.156.215 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + B-LEAF5: + ansible_host: 10.18.156.220 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + B-LEAF6: + ansible_host: 10.18.156.187 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + B-LEAF7: + ansible_host: 10.18.156.233 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + B-LEAF8: + ansible_host: 10.18.156.196 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + B-SPINE1: + ansible_host: 10.18.156.183 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + B-SPINE2: + ansible_host: 10.18.156.182 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + B-SPINE3: + ansible_host: 10.18.156.237 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + B-SPINE4: + ansible_host: 10.18.156.231 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + B-SW1: + ansible_host: 10.18.156.242 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + B1: + ansible_host: 10.18.156.211 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + B2: + ansible_host: 10.18.156.207 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + B3: + ansible_host: 10.18.156.175 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + B4: + ansible_host: 10.18.156.174 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + B5: + ansible_host: 10.18.156.225 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + B6: + ansible_host: 10.18.156.226 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + B7: + ansible_host: 10.18.156.176 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + BB1: + ansible_host: 10.18.156.171 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + BB2: + ansible_host: 10.18.156.238 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + C-LEAF1: + ansible_host: 10.18.156.210 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + C-LEAF2: + ansible_host: 10.18.156.206 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + C-LEAF3: + ansible_host: 10.18.156.202 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + C-LEAF4: + ansible_host: 10.18.156.213 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + C-LEAF5: + ansible_host: 10.18.156.228 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + C-LEAF6: + ansible_host: 10.18.156.192 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + C-LEAF7: + ansible_host: 10.18.156.214 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + C-LEAF8: + ansible_host: 10.18.156.227 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + C-SPINE1: + ansible_host: 10.18.156.223 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + C-SPINE2: + ansible_host: 10.18.156.216 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + C1: + ansible_host: 10.18.156.188 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + C2: + ansible_host: 10.18.156.244 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + C3: + ansible_host: 10.18.156.193 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + C4: + ansible_host: 10.18.156.181 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + C5: + ansible_host: 10.18.156.178 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + C6: + ansible_host: 10.18.156.221 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + D-LEAF1: + ansible_host: 10.18.156.185 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + D-LEAF2: + ansible_host: 10.18.156.234 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + D-LEAF3: + ansible_host: 10.18.156.197 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + D-LEAF4: + ansible_host: 10.18.156.205 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + D-LEAF5: + ansible_host: 10.18.156.173 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + D-LEAF6: + ansible_host: 10.18.156.194 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + D-LEAF7: + ansible_host: 10.18.156.232 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + D-LEAF8: + ansible_host: 10.18.156.218 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + D-SPINE1: + ansible_host: 10.18.156.208 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + D-SPINE2: + ansible_host: 10.18.156.235 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + D-SPINE3: + ansible_host: 10.18.156.190 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + D-SPINE4: + ansible_host: 10.18.156.217 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + D1: + ansible_host: 10.18.156.203 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + D2: + ansible_host: 10.18.156.191 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + D3: + ansible_host: 10.18.156.201 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + D4: + ansible_host: 10.18.156.219 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + D5: + ansible_host: 10.18.156.177 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + D6: + ansible_host: 10.18.156.199 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 + GENERIC: + hosts: + tool-server: + ansible_host: 10.18.156.169 + ansible_user: cvpadmin + ansible_ssh_pass: arista123 diff --git a/datacenter/act/tl_combined_topology.yml b/datacenter/act/tl_combined_topology.yml index dd59a06..799a52f 100644 --- a/datacenter/act/tl_combined_topology.yml +++ b/datacenter/act/tl_combined_topology.yml @@ -2,7 +2,7 @@ cvp: instance: singlenode password: cvproot username: root - version: 2023.3.0 + version: 2024.1.0 generic: password: arista123 username: cvpadmin @@ -569,12 +569,6 @@ links: - connection: - D-LEAF7:Ethernet4 - D-SPINE4:Ethernet7 -- connection: - - D-LEAF7:Ethernet5 - - D-LEAF8:Ethernet5 -- connection: - - D-LEAF7:Ethernet6 - - D-LEAF8:Ethernet6 - connection: - D-LEAF7:Ethernet7 - BB1:Ethernet1 @@ -603,11 +597,11 @@ nodes: - BB1: ip_addr: 192.168.0.9 node_type: veos - version: 4.31.2F + version: 4.32.0F - BB2: ip_addr: 192.168.0.10 node_type: veos - version: 4.31.2F + version: 4.32.0F - act-cv: auto_configuration: true ip_addr: 192.168.0.5 @@ -618,51 +612,51 @@ nodes: - A-LEAF1: ip_addr: 192.168.0.101 node_type: veos - version: 4.31.2F + version: 4.32.0F - A-LEAF2: ip_addr: 192.168.0.102 node_type: veos - version: 4.31.2F + version: 4.32.0F - A-LEAF3: ip_addr: 192.168.0.103 node_type: veos - version: 4.31.2F + version: 4.32.0F - A-LEAF4: ip_addr: 192.168.0.104 node_type: veos - version: 4.31.2F + version: 4.32.0F - A-LEAF5: ip_addr: 192.168.0.105 node_type: veos - version: 4.31.2F + version: 4.32.0F - A-LEAF6: ip_addr: 192.168.0.106 node_type: veos - version: 4.31.2F + version: 4.32.0F - A-LEAF7: ip_addr: 192.168.0.107 node_type: veos - version: 4.31.2F + version: 4.32.0F - A-LEAF8: ip_addr: 192.168.0.108 node_type: veos - version: 4.31.2F + version: 4.32.0F - A-SPINE1: ip_addr: 192.168.0.11 node_type: veos - version: 4.31.2F + version: 4.32.0F - A-SPINE2: ip_addr: 192.168.0.12 node_type: veos - version: 4.31.2F + version: 4.32.0F - A-SPINE3: ip_addr: 192.168.0.13 node_type: veos - version: 4.31.2F + version: 4.32.0F - A-SPINE4: ip_addr: 192.168.0.14 node_type: veos - version: 4.31.2F + version: 4.32.0F - A1: ip_addr: 192.168.0.221 node_type: veos @@ -684,55 +678,55 @@ nodes: - B-LEAF1: ip_addr: 192.168.0.111 node_type: veos - version: 4.31.2F + version: 4.32.0F - B-LEAF2: ip_addr: 192.168.0.112 node_type: veos - version: 4.31.2F + version: 4.32.0F - B-LEAF3: ip_addr: 192.168.0.113 node_type: veos - version: 4.31.2F + version: 4.32.0F - B-LEAF4: ip_addr: 192.168.0.114 node_type: veos - version: 4.31.2F + version: 4.32.0F - B-LEAF5: ip_addr: 192.168.0.115 node_type: veos - version: 4.31.2F + version: 4.32.0F - B-LEAF6: ip_addr: 192.168.0.116 node_type: veos - version: 4.31.2F + version: 4.32.0F - B-LEAF7: ip_addr: 192.168.0.117 node_type: veos - version: 4.31.2F + version: 4.32.0F - B-LEAF8: ip_addr: 192.168.0.118 node_type: veos - version: 4.31.2F + version: 4.32.0F - B-SPINE1: ip_addr: 192.168.0.15 node_type: veos - version: 4.31.2F + version: 4.32.0F - B-SPINE2: ip_addr: 192.168.0.16 node_type: veos - version: 4.31.2F + version: 4.32.0F - B-SPINE3: ip_addr: 192.168.0.17 node_type: veos - version: 4.31.2F + version: 4.32.0F - B-SPINE4: ip_addr: 192.168.0.18 node_type: veos - version: 4.31.2F + version: 4.32.0F - B-SW1: ip_addr: 192.168.0.119 node_type: veos - version: 4.31.2F + version: 4.32.0F - B1: ip_addr: 192.168.0.227 node_type: veos @@ -757,43 +751,43 @@ nodes: - C-LEAF1: ip_addr: 192.168.0.121 node_type: veos - version: 4.31.2F + version: 4.32.0F - C-LEAF2: ip_addr: 192.168.0.122 node_type: veos - version: 4.31.2F + version: 4.32.0F - C-LEAF3: ip_addr: 192.168.0.123 node_type: veos - version: 4.31.2F + version: 4.32.0F - C-LEAF4: ip_addr: 192.168.0.124 node_type: veos - version: 4.31.2F + version: 4.32.0F - C-LEAF5: ip_addr: 192.168.0.125 node_type: veos - version: 4.31.2F + version: 4.32.0F - C-LEAF6: ip_addr: 192.168.0.126 node_type: veos - version: 4.31.2F + version: 4.32.0F - C-LEAF7: ip_addr: 192.168.0.127 node_type: veos - version: 4.31.2F + version: 4.32.0F - C-LEAF8: ip_addr: 192.168.0.128 node_type: veos - version: 4.31.2F + version: 4.32.0F - C-SPINE1: ip_addr: 192.168.0.19 node_type: veos - version: 4.31.2F + version: 4.32.0F - C-SPINE2: ip_addr: 192.168.0.20 node_type: veos - version: 4.31.2F + version: 4.32.0F - C1: ip_addr: 192.168.0.234 node_type: veos @@ -815,51 +809,51 @@ nodes: - D-LEAF1: ip_addr: 192.168.0.129 node_type: veos - version: 4.31.2F + version: 4.32.0F - D-LEAF2: ip_addr: 192.168.0.130 node_type: veos - version: 4.31.2F + version: 4.32.0F - D-LEAF3: ip_addr: 192.168.0.131 node_type: veos - version: 4.31.2F + version: 4.32.0F - D-LEAF4: ip_addr: 192.168.0.132 node_type: veos - version: 4.31.2F + version: 4.32.0F - D-LEAF5: ip_addr: 192.168.0.133 node_type: veos - version: 4.31.2F + version: 4.32.0F - D-LEAF6: ip_addr: 192.168.0.134 node_type: veos - version: 4.31.2F + version: 4.32.0F - D-LEAF7: ip_addr: 192.168.0.135 node_type: veos - version: 4.31.2F + version: 4.32.0F - D-LEAF8: ip_addr: 192.168.0.136 node_type: veos - version: 4.31.2F + version: 4.32.0F - D-SPINE1: ip_addr: 192.168.0.21 node_type: veos - version: 4.31.2F + version: 4.32.0F - D-SPINE2: ip_addr: 192.168.0.22 node_type: veos - version: 4.31.2F + version: 4.32.0F - D-SPINE3: ip_addr: 192.168.0.23 node_type: veos - version: 4.31.2F + version: 4.32.0F - D-SPINE4: ip_addr: 192.168.0.24 node_type: veos - version: 4.31.2F + version: 4.32.0F - D1: ip_addr: 192.168.0.240 node_type: veos @@ -881,4 +875,4 @@ nodes: veos: password: arista123 username: cvpadmin - version: 4.31.2F + version: 4.32.0F diff --git a/datacenter/backbone/inventory.yml b/datacenter/backbone/inventory.yml index f71d547..c43b173 100644 --- a/datacenter/backbone/inventory.yml +++ b/datacenter/backbone/inventory.yml @@ -8,8 +8,8 @@ all: ansible_httpapi_validate_certs: false ansible_network_os: eos ansible_httpapi_port: 443 - ansible_httpapi_host: 10.255.53.196 - ansible_host: 10.255.53.196 + ansible_httpapi_host: 10.18.156.170 + ansible_host: 10.18.156.170 ansible_user: cvpadmin ansible_password: arista123 cv_collection: v3 @@ -18,11 +18,11 @@ all: BACKBONE: hosts: BB1: - ansible_host: 10.255.12.6 + ansible_host: 10.18.156.171 ansible_user: cvpadmin ansible_ssh_pass: arista123 BB2: - ansible_host: 10.255.2.255 + ansible_host: 10.18.156.238 ansible_user: cvpadmin ansible_ssh_pass: arista123 ACT: diff --git a/datacenter/domain-a/inventory.yml b/datacenter/domain-a/inventory.yml index adef633..6b475ce 100644 --- a/datacenter/domain-a/inventory.yml +++ b/datacenter/domain-a/inventory.yml @@ -8,8 +8,8 @@ all: ansible_httpapi_validate_certs: false ansible_network_os: eos ansible_httpapi_port: 443 - ansible_httpapi_host: 10.18.143.30 - ansible_host: 10.18.143.30 + ansible_httpapi_host: 10.18.156.170 + ansible_host: 10.18.156.170 ansible_user: cvpadmin ansible_password: arista123 cv_collection: v3 @@ -20,55 +20,55 @@ all: DOMAIN_A_SPINES: hosts: A-SPINE1: - ansible_host: 10.18.146.123 + ansible_host: 10.18.156.222 ansible_user: cvpadmin ansible_ssh_pass: arista123 A-SPINE2: - ansible_host: 10.18.145.124 + ansible_host: 10.18.156.224 ansible_user: cvpadmin ansible_ssh_pass: arista123 A-SPINE3: - ansible_host: 10.255.75.233 + ansible_host: 10.18.156.198 ansible_user: cvpadmin ansible_ssh_pass: arista123 A-SPINE4: - ansible_host: 10.255.19.92 + ansible_host: 10.18.156.180 ansible_user: cvpadmin ansible_ssh_pass: arista123 DOMAIN_A_L3_LEAVES: hosts: A-LEAF1: - ansible_host: 10.18.145.245 + ansible_host: 10.18.156.241 ansible_user: cvpadmin ansible_ssh_pass: arista123 A-LEAF2: - ansible_host: 10.18.146.110 + ansible_host: 10.18.156.184 ansible_user: cvpadmin ansible_ssh_pass: arista123 A-LEAF3: - ansible_host: 10.18.146.113 + ansible_host: 10.18.156.212 ansible_user: cvpadmin ansible_ssh_pass: arista123 A-LEAF4: - ansible_host: 10.18.146.14 + ansible_host: 10.18.156.179 ansible_user: cvpadmin ansible_ssh_pass: arista123 A-LEAF5: - ansible_host: 10.255.111.40 + ansible_host: 10.18.156.186 ansible_user: cvpadmin ansible_ssh_pass: arista123 A-LEAF6: - ansible_host: 10.255.113.154 + ansible_host: 10.18.156.230 ansible_user: cvpadmin ansible_ssh_pass: arista123 DOMAIN_A_EVPNGW: hosts: A-LEAF7: - ansible_host: 10.18.146.116 + ansible_host: 10.18.156.229 ansible_user: cvpadmin ansible_ssh_pass: arista123 A-LEAF8: - ansible_host: 10.18.145.130 + ansible_host: 10.18.156.204 ansible_user: cvpadmin ansible_ssh_pass: arista123 DOMAIN_A_HOSTS: diff --git a/datacenter/domain-b/inventory.yml b/datacenter/domain-b/inventory.yml index 234eb4a..cf24a85 100644 --- a/datacenter/domain-b/inventory.yml +++ b/datacenter/domain-b/inventory.yml @@ -12,8 +12,8 @@ all: ansible_httpapi_validate_certs: false ansible_network_os: eos ansible_httpapi_port: 443 - ansible_httpapi_host: 10.255.53.196 - ansible_host: 10.255.53.196 + ansible_httpapi_host: 10.18.156.170 + ansible_host: 10.18.156.170 ansible_user: cvpadmin ansible_password: arista123 cv_collection: v3 @@ -24,61 +24,61 @@ all: DOMAIN_B_SPINES: hosts: B-SPINE1: - ansible_host: 10.255.26.207 + ansible_host: 10.18.156.183 ansible_user: cvpadmin ansible_ssh_pass: arista123 B-SPINE2: - ansible_host: 10.255.12.86 + ansible_host: 10.18.156.182 ansible_user: cvpadmin ansible_ssh_pass: arista123 B-SPINE3: - ansible_host: 10.255.38.212 + ansible_host: 10.18.156.237 ansible_user: cvpadmin ansible_ssh_pass: arista123 B-SPINE4: - ansible_host: 10.255.50.158 + ansible_host: 10.18.156.231 ansible_user: cvpadmin ansible_ssh_pass: arista123 DOMAIN_B_L3_LEAVES: hosts: B-LEAF1: - ansible_host: 10.255.35.199 + ansible_host: 10.18.156.243 ansible_user: cvpadmin ansible_ssh_pass: arista123 B-LEAF2: - ansible_host: 10.255.76.11 + ansible_host: 10.18.156.209 ansible_user: cvpadmin ansible_ssh_pass: arista123 B-LEAF3: - ansible_host: 10.255.38.53 + ansible_host: 10.18.156.239 ansible_user: cvpadmin ansible_ssh_pass: arista123 B-LEAF4: - ansible_host: 10.255.3.75 + ansible_host: 10.18.156.215 ansible_user: cvpadmin ansible_ssh_pass: arista123 B-LEAF5: - ansible_host: 10.255.116.177 + ansible_host: 10.18.156.220 ansible_user: cvpadmin ansible_ssh_pass: arista123 B-LEAF6: - ansible_host: 10.255.106.75 + ansible_host: 10.18.156.187 ansible_user: cvpadmin ansible_ssh_pass: arista123 DOMAIN_B_EVPNGW: hosts: B-LEAF7: - ansible_host: 10.255.93.181 + ansible_host: 10.18.156.233 ansible_user: cvpadmin ansible_ssh_pass: arista123 B-LEAF8: - ansible_host: 10.255.38.9 + ansible_host: 10.18.156.196 ansible_user: cvpadmin ansible_ssh_pass: arista123 DOMAIN_B_L2_SW: hosts: B-SW1: - ansible_host: 10.255.107.153 + ansible_host: 10.18.156.242 ansible_user: cvpadmin ansible_ssh_pass: arista123 DOMAIN_B_HOSTS: diff --git a/datacenter/domain-c/inventory.yml b/datacenter/domain-c/inventory.yml index 19e93d6..06ae799 100644 --- a/datacenter/domain-c/inventory.yml +++ b/datacenter/domain-c/inventory.yml @@ -12,8 +12,8 @@ all: ansible_httpapi_validate_certs: false ansible_network_os: eos ansible_httpapi_port: 443 - ansible_httpapi_host: 10.255.53.196 - ansible_host: 10.255.53.196 + ansible_httpapi_host: 10.18.156.170 + ansible_host: 10.18.156.170 ansible_user: cvpadmin ansible_password: arista123 cv_collection: v3 @@ -24,47 +24,47 @@ all: DOMAIN_C_SPINES: hosts: C-SPINE1: - ansible_host: 10.255.14.56 + ansible_host: 10.18.156.223 ansible_user: cvpadmin ansible_ssh_pass: arista123 C-SPINE2: - ansible_host: 10.255.66.221 + ansible_host: 10.18.156.216 ansible_user: cvpadmin ansible_ssh_pass: arista123 DOMAIN_C_L3_LEAVES: hosts: C-LEAF1: - ansible_host: 10.255.95.30 + ansible_host: 10.18.156.210 ansible_user: cvpadmin ansible_ssh_pass: arista123 C-LEAF2: - ansible_host: 10.255.8.243 + ansible_host: 10.18.156.206 ansible_user: cvpadmin ansible_ssh_pass: arista123 C-LEAF3: - ansible_host: 10.255.31.69 + ansible_host: 10.18.156.202 ansible_user: cvpadmin ansible_ssh_pass: arista123 C-LEAF4: - ansible_host: 10.255.36.15 + ansible_host: 10.18.156.213 ansible_user: cvpadmin ansible_ssh_pass: arista123 C-LEAF5: - ansible_host: 10.255.66.237 + ansible_host: 10.18.156.228 ansible_user: cvpadmin ansible_ssh_pass: arista123 C-LEAF6: - ansible_host: 10.255.25.34 + ansible_host: 10.18.156.192 ansible_user: cvpadmin ansible_ssh_pass: arista123 DOMAIN_C_EVPNGW: hosts: C-LEAF7: - ansible_host: 10.255.58.126 + ansible_host: 10.18.156.214 ansible_user: cvpadmin ansible_ssh_pass: arista123 C-LEAF8: - ansible_host: 10.255.30.80 + ansible_host: 10.18.156.227 ansible_user: cvpadmin ansible_ssh_pass: arista123 DOMAIN_C_HOSTS: diff --git a/datacenter/domain-d/group_vars/DOMAIN_D.yml b/datacenter/domain-d/group_vars/DOMAIN_D.yml index f988478..5b004f5 100644 --- a/datacenter/domain-d/group_vars/DOMAIN_D.yml +++ b/datacenter/domain-d/group_vars/DOMAIN_D.yml @@ -5,7 +5,7 @@ pod_name: pod-d spine: defaults: - platform: vEOS-lab + platform: vEOS-lab loopback_ipv4_pool: 1.1.4.0/24 loopback_ipv6_pool: 2001:db8:d:1::0/64 loopback_ipv6_offset: 0 @@ -28,6 +28,7 @@ spine: l3leaf: defaults: platform: vEOS-lab + uplink_ipv4_pool: 192.168.1.0/24 loopback_ipv4_pool: 1.1.4.0/24 loopback_ipv6_pool: 2001:db8:d:1::0/64 loopback_ipv4_offset: 0 @@ -35,10 +36,7 @@ l3leaf: vtep_loopback_ipv4_pool: 2.2.4.0/24 uplink_interfaces: ['Ethernet1', 'Ethernet2', 'Ethernet3', 'Ethernet4'] uplink_switches: ['D-SPINE1', 'D-SPINE2', 'D-SPINE3', 'D-SPINE4'] - uplink_ipv4_pool: 192.168.1.0/24 mlag_interfaces: ['Ethernet5', 'Ethernet6'] - mlag_peer_vlan_structured_config: - mtu: 1500 mlag_peer_ipv4_pool: 169.254.0.0/31 mlag_peer_l3_ipv4_pool: 192.0.0.0/31 mlag_port_channel_id: 1000 @@ -49,8 +47,7 @@ l3leaf: spanning_tree_mode: mstp filter: tenants: - - Prod - - Dev + - DUALSTACK structured_config: spanning_tree: edge_port: @@ -65,6 +62,8 @@ l3leaf: - name: D-LEAF1 id: 1 mgmt_ip: 192.168.0.129/24 + mlag_peer_vlan_structured_config: + ipv6_address: 2001:db8::1/64 uplink_switch_interfaces: - Ethernet1 - Ethernet1 @@ -73,6 +72,8 @@ l3leaf: - name: D-LEAF2 id: 2 mgmt_ip: 192.168.0.130/24 + mlag_peer_vlan_structured_config: + ipv6_address: 2001:db8::2/64 uplink_switch_interfaces: - Ethernet2 - Ethernet2 @@ -86,6 +87,8 @@ l3leaf: - name: D-LEAF3 id: 3 mgmt_ip: 192.168.0.131/24 + mlag_peer_vlan_structured_config: + ipv6_address: 2001:db8::1/64 uplink_switch_interfaces: - Ethernet3 - Ethernet3 @@ -94,6 +97,8 @@ l3leaf: - name: D-LEAF4 id: 4 mgmt_ip: 192.168.0.132/24 + mlag_peer_vlan_structured_config: + ipv6_address: 2001:db8::2/64 uplink_switch_interfaces: - Ethernet4 - Ethernet4 @@ -107,6 +112,8 @@ l3leaf: - name: D-LEAF5 id: 5 mgmt_ip: 192.168.0.133/24 + mlag_peer_vlan_structured_config: + ipv6_address: 2001:db8::1/64 uplink_switch_interfaces: - Ethernet5 - Ethernet5 @@ -115,6 +122,8 @@ l3leaf: - name: D-LEAF6 id: 6 mgmt_ip: 192.168.0.134/24 + mlag_peer_vlan_structured_config: + ipv6_address: 2001:db8::2/64 uplink_switch_interfaces: - Ethernet6 - Ethernet6 @@ -122,9 +131,7 @@ l3leaf: - Ethernet6 - group: DOMAIN_D_EVPNGW bgp_as: 65478 - filter: - tenants: - - EVPNGW + mlag: false evpn_gateway: # Specific BGP EVPN Gateway functionality for route types 2 (MAC-IP), 3 (IMET) and 5 (IP-PREFIX) can be enabled separately as needed. evpn_l2: diff --git a/datacenter/domain-d/group_vars/DOMAIN_D_EVPNGW.yml b/datacenter/domain-d/group_vars/DOMAIN_D_EVPNGW.yml index 9200514..6b2a18e 100644 --- a/datacenter/domain-d/group_vars/DOMAIN_D_EVPNGW.yml +++ b/datacenter/domain-d/group_vars/DOMAIN_D_EVPNGW.yml @@ -4,5 +4,7 @@ type: l3leaf evpn_multicast: false underlay_multicast: false -custom_templates: - - af-evpn.j2 +underlay_ipv6: false +underlay_rfc5549: false +overlay_mlag_rfc5549: false +overlay_routing_protocol_address_family: ipv4 diff --git a/datacenter/domain-d/group_vars/DOMAIN_D_L3_LEAVES.yml b/datacenter/domain-d/group_vars/DOMAIN_D_L3_LEAVES.yml index a7d9741..3b0671b 100644 --- a/datacenter/domain-d/group_vars/DOMAIN_D_L3_LEAVES.yml +++ b/datacenter/domain-d/group_vars/DOMAIN_D_L3_LEAVES.yml @@ -5,10 +5,3 @@ dhcp_relay: tunnel_requests_disabled: true mlag_peerlink_requests_disabled: true -# variables used in custom templates -## _ prefix = bypass avd schema validation -_prod_multicast_group_overlay: 239.0.10.101 -_prod_multicast_group_encap: 232.1.1.10 - -_dev_multicast_group_overlay: 239.0.50.101 -_dev_multicast_group_encap: 232.2.2.50 diff --git a/datacenter/domain-d/group_vars/DOMAIN_D_SPINES.yml b/datacenter/domain-d/group_vars/DOMAIN_D_SPINES.yml index d362d0c..40217e1 100644 --- a/datacenter/domain-d/group_vars/DOMAIN_D_SPINES.yml +++ b/datacenter/domain-d/group_vars/DOMAIN_D_SPINES.yml @@ -4,3 +4,24 @@ type: spine switchport_default: mode: routed +peer_filters: + - name: LEAF-AS-RANGE + sequence_numbers: + - sequence: 10 + match: 'as-range 65401-65499 result accept' + +csc_router_bgp: + address_family_ipv6: + redistribute_routes: + - source_protocol: connected + route_map: RM-CONN-2-BGP + listen_ranges: + - prefix: 1.1.0.0/16 + peer_group: EVPN-OVERLAY-PEERS + peer_filter: LEAF-AS-RANGE + - prefix: 2001:db8:d:1::/64 + peer_group: EVPN-OVERLAY-PEERS + peer_filter: LEAF-AS-RANGE + - prefix: 192.168.1.0/24 + peer_group: LOCAL-UNDERLAY-PEERS + peer_filter: LEAF-AS-RANGE diff --git a/datacenter/domain-d/group_vars/FABRIC.yml b/datacenter/domain-d/group_vars/FABRIC.yml index 942f710..3fe997f 100644 --- a/datacenter/domain-d/group_vars/FABRIC.yml +++ b/datacenter/domain-d/group_vars/FABRIC.yml @@ -4,10 +4,14 @@ fabric_name: FABRIC underlay_routing_protocol: ebgp overlay_routing_protocol: ebgp +underlay_multicast: false +evpn_multicast: false + underlay_ipv6: true -# underlay_multicast: true -# evpn_multicast: true underlay_rfc5549: true +overlay_mlag_rfc5549: true +overlay_routing_protocol_address_family: ipv6 + fabric_ip_addressing: mlag: algorithm: same_subnet @@ -19,6 +23,8 @@ bgp_peer_groups: remove_private_as: replace_as: true bfd: false + ipv4_underlay_peers: + name: LOCAL-UNDERLAY-PEERS l3_edge: # Define a new IP pool that will be used to asign IP addreses to L3 Edge interfaces. @@ -50,6 +56,3 @@ l3_edge: nodes: [D-LEAF8, BB2] interfaces: [Ethernet8, Ethernet2] profile: DCI_D_profile - -custom_templates: - - vxlan-mcast-overlay.j2 diff --git a/datacenter/domain-d/inventory.yml b/datacenter/domain-d/inventory.yml index 5728b76..cf0821c 100644 --- a/datacenter/domain-d/inventory.yml +++ b/datacenter/domain-d/inventory.yml @@ -8,8 +8,8 @@ all: ansible_httpapi_validate_certs: false ansible_network_os: eos ansible_httpapi_port: 443 - ansible_httpapi_host: 10.255.53.196 - ansible_host: 10.255.53.196 + ansible_httpapi_host: 10.18.156.170 + ansible_host: 10.18.156.170 ansible_user: cvpadmin ansible_password: arista123 cv_collection: v3 @@ -20,81 +20,81 @@ all: DOMAIN_D_SPINES: hosts: D-SPINE1: - ansible_host: 10.255.22.102 + ansible_host: 10.18.156.208 ansible_user: cvpadmin ansible_ssh_pass: arista123 D-SPINE2: - ansible_host: 10.255.62.22 + ansible_host: 10.18.156.235 ansible_user: cvpadmin ansible_ssh_pass: arista123 D-SPINE3: - ansible_host: 10.255.75.233 + ansible_host: 10.18.156.190 ansible_user: cvpadmin ansible_ssh_pass: arista123 D-SPINE4: - ansible_host: 10.255.19.92 + ansible_host: 10.18.156.217 ansible_user: cvpadmin ansible_ssh_pass: arista123 DOMAIN_D_L3_LEAVES: hosts: D-LEAF1: - ansible_host: 10.255.42.127 + ansible_host: 10.18.156.185 ansible_user: cvpadmin ansible_ssh_pass: arista123 D-LEAF2: - ansible_host: 10.255.60.171 + ansible_host: 10.18.156.234 ansible_user: cvpadmin ansible_ssh_pass: arista123 D-LEAF3: - ansible_host: 10.255.69.198 + ansible_host: 10.18.156.197 ansible_user: cvpadmin ansible_ssh_pass: arista123 D-LEAF4: - ansible_host: 10.255.112.72 + ansible_host: 10.18.156.205 ansible_user: cvpadmin ansible_ssh_pass: arista123 D-LEAF5: - ansible_host: 10.255.111.40 + ansible_host: 10.18.156.173 ansible_user: cvpadmin ansible_ssh_pass: arista123 D-LEAF6: - ansible_host: 10.255.113.154 + ansible_host: 10.18.156.194 ansible_user: cvpadmin ansible_ssh_pass: arista123 DOMAIN_D_EVPNGW: hosts: D-LEAF7: - ansible_host: 10.255.36.138 + ansible_host: 10.18.156.232 ansible_user: cvpadmin ansible_ssh_pass: arista123 D-LEAF8: - ansible_host: 10.255.126.72 + ansible_host: 10.18.156.218 ansible_user: cvpadmin ansible_ssh_pass: arista123 DOMAIN_D_HOSTS: hosts: D1: - ansible_host: 10.255.20.78 + ansible_host: 10.18.156.203 ansible_user: cvpadmin ansible_ssh_pass: arista123 D2: - ansible_host: 10.255.88.201 + ansible_host: 10.18.156.191 ansible_user: cvpadmin ansible_ssh_pass: arista123 D3: - ansible_host: 10.255.113.150 + ansible_host: 10.18.156.201 ansible_user: cvpadmin ansible_ssh_pass: arista123 D4: - ansible_host: 10.255.2.139 + ansible_host: 10.18.156.219 ansible_user: cvpadmin ansible_ssh_pass: arista123 D5: - ansible_host: 10.255.70.238 + ansible_host: 10.18.156.177 ansible_user: cvpadmin ansible_ssh_pass: arista123 D6: - ansible_host: 10.255.119.7 + ansible_host: 10.18.156.199 ansible_user: cvpadmin ansible_ssh_pass: arista123 NETWORK_SERVICES: diff --git a/datacenter/domain-d/lab_topology/FABRIC-act_topology.yml b/datacenter/domain-d/lab_topology/FABRIC-act_topology.yml index 5d29488..9432178 100644 --- a/datacenter/domain-d/lab_topology/FABRIC-act_topology.yml +++ b/datacenter/domain-d/lab_topology/FABRIC-act_topology.yml @@ -271,14 +271,6 @@ links: - D-LEAF7:Ethernet4 - D-SPINE4:Ethernet7 - - connection: - - D-LEAF7:Ethernet5 - - D-LEAF8:Ethernet5 - - - connection: - - D-LEAF7:Ethernet6 - - D-LEAF8:Ethernet6 - - connection: - D-LEAF7:Ethernet7 - BB1:Ethernet1 diff --git a/datacenter/global_vars/evpn_vxlan/NETWORK_SERVICES.yml b/datacenter/global_vars/evpn_vxlan/NETWORK_SERVICES.yml index 8b4d56e..67886b3 100644 --- a/datacenter/global_vars/evpn_vxlan/NETWORK_SERVICES.yml +++ b/datacenter/global_vars/evpn_vxlan/NETWORK_SERVICES.yml @@ -68,10 +68,10 @@ tenants: profile: VLAN80 - name: Prod mac_vrf_vni_base: 10000 - # evpn_l3_multicast: - # enabled: true - # evpn_underlay_l3_multicast_group_ipv4_pool: 232.1.1.1/24 - # evpn_underlay_l3_multicast_group_ipv4_pool_offset: -49999 + evpn_l3_multicast: + enabled: true + evpn_underlay_l3_multicast_group_ipv4_pool: 232.1.1.1/24 + evpn_underlay_l3_multicast_group_ipv4_pool_offset: -49999 vrfs: - name: Prod vrf_vni: 50001 @@ -102,10 +102,10 @@ tenants: profile: VLAN40 - name: Dev mac_vrf_vni_base: 10000 - # evpn_l3_multicast: - # enabled: true - # evpn_underlay_l3_multicast_group_ipv4_pool: 232.2.2.1/24 - # evpn_underlay_l3_multicast_group_ipv4_pool_offset: -50000 + evpn_l3_multicast: + enabled: true + evpn_underlay_l3_multicast_group_ipv4_pool: 232.2.2.1/24 + evpn_underlay_l3_multicast_group_ipv4_pool_offset: -50000 vrfs: - name: Dev vrf_vni: 50002 @@ -134,6 +134,31 @@ tenants: - id: 80 name: Black profile: VLAN80 + - name: DUALSTACK + mac_vrf_vni_base: 10000 + vrfs: + - name: Prod + vrf_vni: 50001 + mlag_ibgp_peering_vlan: 3001 + redistribute_mlag_ibgp_peering_vrfs: false + svis: + - id: 10 + name: Blue + profile: IPV6_VLAN10 + - name: Dev + vrf_vni: 50002 + mlag_ibgp_peering_vlan: 3002 + redistribute_mlag_ibgp_peering_vrfs: false + svis: + - id: 50 + name: Yellow + profile: IPV6_VLAN50 + - id: 70 + name: Brown + profile: IPV6_VLAN70 + - id: 90 + name: Pink + profile: IPV6_VLAN90 svi_profiles: - profile: global-svi-profile @@ -163,3 +188,29 @@ svi_profiles: - profile: VLAN80 parent_profile: global-svi-profile ip_address_virtual: 10.80.80.1/24 + - profile: VLAN90 + parent_profile: global-svi-profile + ip_address_virtual: 10.90.90.1/24 + - profile: IPV6_VLAN10 + parent_profile: global-svi-profile + ip_address_virtual: 10.10.10.1/24 + ipv6_address_virtuals: + - '2001:db8:10:10::1/64' + ipv6_enable: true + - profile: IPV6_VLAN50 + parent_profile: global-svi-profile + ip_address_virtual: 10.50.50.1/24 + ipv6_address_virtuals: + - '2001:db8:50:50::1/64' + - profile: IPV6_VLAN70 + parent_profile: global-svi-profile + ip_address_virtual: 10.70.70.1/24 + ipv6_address_virtuals: + - '2001:db8:50:50::1/64' + ipv6_enable: true + - profile: IPV6_VLAN90 + parent_profile: global-svi-profile + ip_address_virtual: 10.90.90.1/24 + ipv6_address_virtuals: + - '2001:db8:90:90::1/64' + ipv6_enable: true