Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Raw cli cleanup #6

Merged
merged 2 commits into from
Apr 8, 2024
Merged

Raw cli cleanup #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68ef4c5
remove or replace eos_cli group variables
Apr 8, 2024
93a36c5
remove or replace eos_cli group variables
Apr 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions datacenter/backbone/group_vars/BACKBONE.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ backbone:
platform: vEOS-lab
loopback_ipv4_pool: 1.1.0.0/24
bgp_as: 65500
raw_eos_cli: |
Copy link

@ClausHolbechArista ClausHolbechArista Apr 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is also used in WAN, so we have introduced a model for it in eos_cli_config_gen.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noted! I'll keep that in mind once we add the WAN deployment to the repo. Thanks @ClausHolbechArista

agent KernelFib environment KERNELFIB_PROGRAM_ALL_ECMP='true'

nodes:
- name: BB1
id: 1
Expand Down
3 changes: 0 additions & 3 deletions datacenter/domain-a/group_vars/DOMAIN_A.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@ l3leaf:
spanning_tree:
edge_port:
bpduguard_default: true
# can remove agent KernelFib command, not in tech library
raw_eos_cli: |
agent KernelFib environment KERNELFIB_PROGRAM_ALL_ECMP='true'
node_groups:
- group: DOMAIN_A_LA
bgp_as: 65112
Expand Down
1 change: 1 addition & 0 deletions datacenter/domain-a/group_vars/DOMAIN_A_L3_LEAVES.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ type: l3leaf

dhcp_relay:
tunnel_requests_disabled: true
mlag_peerlink_requests_disabled: true

# variables used in custom templates
## _ prefix = bypass avd schema validation
Expand Down
4 changes: 2 additions & 2 deletions datacenter/domain-a/group_vars/FABRIC.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ fabric_name: FABRIC
underlay_routing_protocol: ebgp
overlay_routing_protocol: ebgp

# underlay_multicast: true
# evpn_multicast: true
underlay_multicast: true
evpn_multicast: true

fabric_ip_addressing:
mlag:
Expand Down
4 changes: 0 additions & 4 deletions datacenter/domain-b/group_vars/DOMAIN_B.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,6 @@ l3leaf:
- hostname: BB2
bgp_as: 65500
ip_address: 1.1.0.2
raw_eos_cli: |
dhcp relay
mlag peer-link requests disabled
agent KernelFib environment KERNELFIB_PROGRAM_ALL_ECMP='true'
nodes:
- name: B-LEAF7
id: 7
Expand Down
10 changes: 5 additions & 5 deletions datacenter/domain-b/group_vars/DOMAIN_B_L3_LEAVES.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ type: l3leaf


cv_tags_topology_type: leaf
#evpn_multicast: true
evpn_multicast: true

dhcp_relay:
tunnel_requests_disabled: true

# variables used in custom templates
# _prod_multicast_group_overlay: 239.0.20.101
# _prod_multicast_group_encap: 232.1.1.20
_prod_multicast_group_overlay: 239.0.20.101
_prod_multicast_group_encap: 232.1.1.20

# _dev_multicast_group_overlay: 239.0.60.101
# _dev_multicast_group_encap: 232.2.2.60
_dev_multicast_group_overlay: 239.0.60.101
_dev_multicast_group_encap: 232.2.2.60

_evpn_aa_multihoming: true
10 changes: 2 additions & 8 deletions datacenter/domain-c/group_vars/DOMAIN_C.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@ spine:
loopback_ipv4_pool: 1.1.3.0/24
vtep_loopback_ipv4_pool: 10.3.3.0/24
virtual_router_mac_address: 00:1c:73:00:00:01
bgp_as: 65300
raw_eos_cli: |
agent KernelFib environment KERNELFIB_PROGRAM_ALL_ECMP='true'
nodes:
bgp_as: 65300 nodes:

- name: C-SPINE1
id: 201
mgmt_ip: 192.168.0.19/24
Expand Down Expand Up @@ -46,10 +44,6 @@ l3leaf:
spanning_tree:
edge_port:
bpduguard_default: true
raw_eos_cli: |
dhcp relay
mlag peer-link requests disabled
agent KernelFib environment KERNELFIB_PROGRAM_ALL_ECMP='true'
node_groups:
- group: DOMAIN_C_LA
bgp_as: 65312
Expand Down
4 changes: 0 additions & 4 deletions datacenter/domain-c/group_vars/DOMAIN_C_EVPNGW.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ csc_route_maps:
match:
- 'ip address prefix-list PL-GATEWAY-LOOP'

# csc_vlan_interfaces:
# - name: 'Vlan4094'
# mtu: 1500

monitor_connectivity:
shutdown: false
vrfs:
Expand Down
1 change: 1 addition & 0 deletions datacenter/domain-c/group_vars/DOMAIN_C_L3_LEAVES.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ type: l3leaf

dhcp_relay:
tunnel_requests_disabled: true
mlag_peerlink_requests_disabled: true

csc_vlan_interfaces:
- name: 'Vlan4094'
Expand Down
4 changes: 2 additions & 2 deletions datacenter/domain-c/group_vars/FABRIC.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ overlay_routing_protocol: ebgp

vtep_vvtep_ip: 10.3.3.255/32

# underlay_multicast: true
# evpn_multicast: true
underlay_multicast: true
evpn_multicast: true

bgp_peer_groups:
evpn_overlay_core:
Expand Down
7 changes: 2 additions & 5 deletions datacenter/domain-d/group_vars/DOMAIN_D.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ spine:
loopback_ipv6_pool: 2001:db8:d:1::0/64
loopback_ipv6_offset: 0
bgp_as: 65400
raw_eos_cli: |
agent KernelFib environment KERNELFIB_PROGRAM_ALL_ECMP='true'

nodes:
- name: D-SPINE1
id: 201
Expand Down Expand Up @@ -56,9 +55,7 @@ l3leaf:
spanning_tree:
edge_port:
bpduguard_default: true
# can remove agent KernelFib command, not in tech library
raw_eos_cli: |
agent KernelFib environment KERNELFIB_PROGRAM_ALL_ECMP='true'

node_groups:
- group: DOMAIN_D_LA
bgp_as: 65412
Expand Down
1 change: 1 addition & 0 deletions datacenter/domain-d/group_vars/DOMAIN_D_L3_LEAVES.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ type: l3leaf

dhcp_relay:
tunnel_requests_disabled: true
mlag_peerlink_requests_disabled: true

# variables used in custom templates
## _ prefix = bypass avd schema validation
Expand Down
Loading