modify makefile with server deploy options. update readme

.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/avd/universal:python3.11-avd-devel"
 }

datacenter/Makefile

@@ -32,11 +32,7 @@ deploy-eapi-domain-a: ## Deploy Configs via eAPI
 
 .PHONY: deploy-cvp-domain-a
 deploy-cvp-domain-a: ## Deploy using CV CI workflow (i.e. workspaces, studios, etc)
-	ansible-playbook playbooks/fabric-deploy-cv-ci.yml -i domain-a/inventory.yml
-
-.PHONY: deploy-servers-domain-a
-deploy-servers-domain-a: ## Deploy Server Configs via eAPI
-	ansible-playbook playbooks/server-deploy-eapi.yml -i domain-a/inventory.yml -e "target_hosts=DOMAIN_A_HOSTS"
+	ansible-playbook playbooks/fabric-deploy-cvp.yml -i domain-a/inventory.yml
 
 .PHONY: validate-domain-a
 validate-domain-a:
@@ -59,12 +55,8 @@ deploy-eapi-domain-b: ## Deploy Configs via eAPI
 	ansible-playbook playbooks/fabric-deploy-eapi.yml -i domain-b/inventory.yml
 
 .PHONY: deploy-cvp-domain-b
-deploy-cvp-domain-b: ## Deploy using CV CI workflow (i.e. workspaces, studios, etc)
-	ansible-playbook playbooks/fabric-deploy-cv-ci.yml -i domain-b/inventory.yml
-
-.PHONY: deploy-servers-domain-b
-deploy-servers-domain-b: ## Deploy Server Configs via eAPI
-	ansible-playbook playbooks/server-deploy-eapi.yml -i domain-b/inventory.yml -e "target_hosts=DOMAIN_B_HOSTS"
+deploy-cvp-domain-b: ## Deploy Configs via CVP
+	ansible-playbook playbooks/fabric-deploy-cvp.yml -i domain-b/inventory.yml
 
 .PHONY: validate-domain-b
 validate-domain-b:
@@ -88,11 +80,7 @@ deploy-eapi-domain-c: ## Deploy Configs via eAPI
 
 .PHONY: deploy-cvp-domain-c
 deploy-cvp-domain-c: ## Deploy using CV CI workflow (i.e. workspaces, studios, etc)
-	ansible-playbook playbooks/fabric-deploy-cv-ci.yml -i domain-c/inventory.yml
-
-.PHONY: deploy-servers-domain-c
-deploy-servers-domain-c: ## Deploy Server Configs via eAPI
-	ansible-playbook playbooks/server-deploy-eapi.yml -i domain-c/inventory.yml -e "target_hosts=DOMAIN_C_HOSTS"
+	ansible-playbook playbooks/fabric-deploy-cvp.yml -i domain-c/inventory.yml
 
 .PHONY: validate-domain-c
 validate-domain-c:
@@ -116,7 +104,7 @@ deploy-eapi-domain-d: ## Deploy Configs via eAPI
 
 .PHONY: deploy-cvp-domain-d
 deploy-cvp-domain-d: ## Deploy using CV CI workflow (i.e. workspaces, studios, etc)
-	ansible-playbook playbooks/fabric-deploy-cv-ci.yml -i domain-d/inventory.yml
+	ansible-playbook playbooks/fabric-deploy-cvp.yml -i domain-d/inventory.yml
 
 .PHONY: deploy-servers-domain-d
 deploy-servers-domain-d: ## Deploy Server Configs via eAPI
@@ -144,8 +132,18 @@ deploy-backbone: ## Deploy Configs via eAPI
 
 .PHONY: deploy-cvp-backbone
 deploy-cvp-backbone: ## Deploy using CV CI workflow (i.e. workspaces, studios, etc)
-	ansible-playbook playbooks/fabric-deploy-cv-ci.yml -i backbone/inventory.yml
+	ansible-playbook playbooks/fabric-deploy-cvp.yml -i backbone/inventory.yml
+
+########################################################
+# Servers
+########################################################
+
+.PHONY: deploy-servers-eapi
+	ansible-playbook playbooks/servers-deploy-eapi.yml -i servers/inventory.yml
 
+.PHONY: deploy-servers-cv
+	ansible-playbook playbooks/servers-deploy-cvp.yml -i servers/inventory.yml
+
 ########################################################
 # Replace domain inventory ansible_hosts with ACT inventory ansible_hosts 
 ########################################################

datacenter/README.md

@@ -107,12 +107,22 @@ make build-domain-a build-domain-b build-domain-c build-domain-d build-domain-ba
 ```
 ## Deploy
 
-Deploy using eapi
+Deploy Fabric using eapi
 ```
 make deploy-eapi-domain-<domain>
 ```
 
-Deploy using cvp
+Deploy Fabric using cvp
 ```
 make deploy-cvp-domain-<domain>
 ```
+
+Deploy Servers using eapi
+```
+make deploy-servers-eapi
+```
+
+Deploy Servers using CVP
+```
+make deploy-servers-cv
+```

datacenter/domain-a/group_vars/CONNECTED_ENDPOINTS.yml

@@ -11,7 +11,7 @@ servers:
       - endpoint_ports: [ Ethernet1, Ethernet2 ]
         switch_ports: [ Ethernet7, Ethernet7 ]
         switches: [ A-LEAF1, A-LEAF2 ]
-        vlans: 20
+        vlans: 10
         profile: DEFAULT
         port_channel:
           description: A1

datacenter/domain-a/inventory.yml

@@ -73,27 +73,27 @@ all:
                   ansible_ssh_pass: arista123
     DOMAIN_A_HOSTS:
       hosts:
-        HostA:
+        A1:
           ansible_host: 10.18.146.142
           ansible_user: cvpadmin
           ansible_ssh_pass: arista123
-        HostB:
+        A2:
           ansible_host: 10.18.146.144
           ansible_user: cvpadmin
           ansible_ssh_pass: arista123
-        HostC:
+        A3:
           ansible_host: 10.18.145.133
           ansible_user: cvpadmin
           ansible_ssh_pass: arista123
-        HostD:
+        A4:
           ansible_host: 10.18.146.19
           ansible_user: cvpadmin
           ansible_ssh_pass: arista123
-        HostE:
+        A5:
           ansible_host: 10.18.145.121
           ansible_user: cvpadmin
           ansible_ssh_pass: arista123
-        HostF:
+        A6:
           ansible_host: 10.255.119.7
           ansible_user: cvpadmin
           ansible_ssh_pass: arista123

datacenter/domain-b/group_vars/FABRIC.yml

@@ -7,7 +7,7 @@ overlay_routing_protocol: ibgp
 isis_area_id: 49.1111
 evpn_short_esi_prefix: '0000:000b:'
 
-#underlay_multicast: true
+underlay_multicast: true
 
 p2p_uplinks_mtu: 1500
 

datacenter/domain-b/lab_topology/FABRIC-act_topology.yml

@@ -1,17 +1,16 @@
+
+# Global parameters for different node types
 veos:
-  # Define the global vEOS node parameters
   username: cvpadmin
   password: arista123
   version: 4.31.2F
 
 generic:
-  # Define global generic node parameters
   username: cvpadmin
   password: arista123
   version: ubuntu-2204-lts
 
 cvp:
-  # Define global cvp node parameters
   username: root
   password: cvproot
   version: 2023.3.0
@@ -71,28 +70,6 @@ nodes:
       ip_addr: 192.168.0.119
       node_type: veos
       version: 4.31.2F
-  - B1:
-      ip_addr: 192.168.0.227
-      node_type: veos
-  - B2:
-      ip_addr: 192.168.0.228
-      node_type: veos
-  - B3:
-      ip_addr: 192.168.0.229
-      node_type: veos
-  - B4:
-      ip_addr: 192.168.0.230
-      node_type: veos
-  - B5:
-      ip_addr: 192.168.0.231
-      node_type: veos
-  - B6:
-      ip_addr: 192.168.0.232
-      node_type: veos
-  - B7:
-      ip_addr: 192.168.0.233
-      node_type: veos
-
   - act-cv:
       ip_addr: 192.168.0.5
       node_type: cvp
@@ -101,195 +78,135 @@ nodes:
       ip_addr: 192.168.0.6
       node_type: generic
 links:
-
     - connection:
         - B-LEAF1:Ethernet1
         - B-SPINE1:Ethernet1
-
     - connection:
         - B-LEAF1:Ethernet2
         - B-SPINE2:Ethernet1
-
     - connection:
         - B-LEAF1:Ethernet3
         - B-SPINE3:Ethernet1
-
     - connection:
         - B-LEAF1:Ethernet4
         - B-SPINE4:Ethernet1
-
     - connection:
         - B-LEAF1:Ethernet7
         - B1:Ethernet1
-
     - connection:
         - B-LEAF1:Ethernet8
         - B2:Ethernet1
-
     - connection:
         - B-LEAF2:Ethernet1
         - B-SPINE1:Ethernet2
-
     - connection:
         - B-LEAF2:Ethernet2
         - B-SPINE2:Ethernet2
-
     - connection:
         - B-LEAF2:Ethernet3
         - B-SPINE3:Ethernet2
-
     - connection:
         - B-LEAF2:Ethernet4
         - B-SPINE4:Ethernet2
-
     - connection:
         - B-LEAF2:Ethernet7
         - B1:Ethernet2
-
     - connection:
         - B-LEAF2:Ethernet8
         - B2:Ethernet2
-
     - connection:
         - B-LEAF3:Ethernet1
         - B-SPINE1:Ethernet3
-
     - connection:
         - B-LEAF3:Ethernet2
         - B-SPINE2:Ethernet3
-
     - connection:
         - B-LEAF3:Ethernet3
         - B-SPINE3:Ethernet3
-
     - connection:
         - B-LEAF3:Ethernet4
         - B-SPINE4:Ethernet3
-
     - connection:
         - B-LEAF3:Ethernet7
         - B3:Ethernet1
-
     - connection:
         - B-LEAF3:Ethernet8
         - B4:Ethernet1
-
     - connection:
         - B-LEAF4:Ethernet1
         - B-SPINE1:Ethernet4
-
     - connection:
         - B-LEAF4:Ethernet2
         - B-SPINE2:Ethernet4
-
     - connection:
         - B-LEAF4:Ethernet3
         - B-SPINE3:Ethernet4
-
     - connection:
         - B-LEAF4:Ethernet4
         - B-SPINE4:Ethernet4
-
     - connection:
         - B-LEAF4:Ethernet7
         - B5:Ethernet1
-
     - connection:
         - B-LEAF4:Ethernet8
         - B4:Ethernet2
-
     - connection:
         - B-LEAF5:Ethernet1
         - B-SPINE1:Ethernet5
-
     - connection:
         - B-LEAF5:Ethernet2
         - B-SPINE2:Ethernet5
-
     - connection:
         - B-LEAF5:Ethernet3
         - B-SPINE3:Ethernet5
-
     - connection:
         - B-LEAF5:Ethernet4
         - B-SPINE4:Ethernet5
-
     - connection:
         - B-LEAF6:Ethernet1
         - B-SPINE1:Ethernet6
-
     - connection:
         - B-LEAF6:Ethernet2
         - B-SPINE2:Ethernet6
-
     - connection:
         - B-LEAF6:Ethernet3
         - B-SPINE3:Ethernet6
-
     - connection:
         - B-LEAF6:Ethernet4
         - B-SPINE4:Ethernet6
-
     - connection:
         - B-LEAF7:Ethernet1
         - B-SPINE1:Ethernet7
-
     - connection:
         - B-LEAF7:Ethernet2
         - B-SPINE2:Ethernet7
-
     - connection:
         - B-LEAF7:Ethernet3
         - B-SPINE3:Ethernet7
-
     - connection:
         - B-LEAF7:Ethernet4
         - B-SPINE4:Ethernet7
-
-    - connection:
-        - B-LEAF7:Ethernet7
-        - BB1:Ethernet3
-
-    - connection:
-        - B-LEAF7:Ethernet8
-        - BB2:Ethernet3
-
     - connection:
         - B-LEAF8:Ethernet1
         - B-SPINE1:Ethernet8
-
     - connection:
         - B-LEAF8:Ethernet2
         - B-SPINE2:Ethernet8
-
     - connection:
         - B-LEAF8:Ethernet3
         - B-SPINE3:Ethernet8
-
     - connection:
         - B-LEAF8:Ethernet4
         - B-SPINE4:Ethernet8
-
-    - connection:
-        - B-LEAF8:Ethernet7
-        - BB1:Ethernet4
-
-    - connection:
-        - B-LEAF8:Ethernet8
-        - BB2:Ethernet4
-
     - connection:
         - B-SW1:Ethernet1
         - B-LEAF5:Ethernet7
-
     - connection:
         - B-SW1:Ethernet2
         - B-LEAF6:Ethernet7
-
     - connection:
         - B-SW1:Ethernet3
         - B6:Ethernet1
-
     - connection:
         - B-SW1:Ethernet4
         - B7:Ethernet1