diff --git a/ansible/roles/eos/tasks/ceos.yml b/ansible/roles/eos/tasks/ceos.yml index 56318d2d4a8..4fb623f1c73 100644 --- a/ansible/roles/eos/tasks/ceos.yml +++ b/ansible/roles/eos/tasks/ceos.yml @@ -20,8 +20,8 @@ set_fact: force_restart=no when: snmp_data.ansible_facts.ansible_sysname is defined -- include_tasks: ceos_config.yml - include_vars: group_vars/vm_host/ceos.yml +- include_tasks: ceos_config.yml - name: Create cEOS container become: yes diff --git a/ansible/roles/eos/templates/dpu-tor.j2 b/ansible/roles/eos/templates/dpu-tor.j2 index 0b6ec97538b..ca998aed03d 100644 --- a/ansible/roles/eos/templates/dpu-tor.j2 +++ b/ansible/roles/eos/templates/dpu-tor.j2 @@ -106,6 +106,7 @@ router bgp {{ host['bgp']['asn'] }} {% for remote_ip in remote_ips %} neighbor {{ remote_ip }} remote-as {{ asn }} neighbor {{ remote_ip }} description {{ asn }} + neighbor {{ remote_ip }} next-hop-self {% if remote_ip | ipv6 %} address-family ipv6 neighbor {{ remote_ip }} activate diff --git a/ansible/roles/eos/templates/m0-mx.j2 b/ansible/roles/eos/templates/m0-mx.j2 index 641059da5d7..f1b924dbe22 100644 --- a/ansible/roles/eos/templates/m0-mx.j2 +++ b/ansible/roles/eos/templates/m0-mx.j2 @@ -102,6 +102,7 @@ router bgp {{ host['bgp']['asn'] }} {% for remote_ip in remote_ips %} neighbor {{ remote_ip }} remote-as {{ asn }} neighbor {{ remote_ip }} description {{ asn }} + neighbor {{ remote_ip }} next-hop-self {% if remote_ip | ipv6 %} address-family ipv6 neighbor {{ remote_ip }} activate diff --git a/ansible/roles/eos/templates/t0-8-lag-leaf.j2 b/ansible/roles/eos/templates/t0-8-lag-leaf.j2 index 3e1d0f62d61..246cb22c6b9 100644 --- a/ansible/roles/eos/templates/t0-8-lag-leaf.j2 +++ b/ansible/roles/eos/templates/t0-8-lag-leaf.j2 @@ -106,6 +106,7 @@ router bgp {{ host['bgp']['asn'] }} {% for remote_ip in remote_ips %} neighbor {{ remote_ip }} remote-as {{ asn }} neighbor {{ remote_ip }} description {{ asn }} + neighbor {{ remote_ip }} next-hop-self {% if remote_ip | ipv6 %} address-family ipv6 neighbor {{ remote_ip }} activate diff --git a/ansible/roles/eos/templates/t0-backend-leaf.j2 b/ansible/roles/eos/templates/t0-backend-leaf.j2 index 7f5b0e9e8dc..0240dfcdf0e 100644 --- a/ansible/roles/eos/templates/t0-backend-leaf.j2 +++ b/ansible/roles/eos/templates/t0-backend-leaf.j2 @@ -136,6 +136,7 @@ router bgp {{ host['bgp']['asn'] }} {% for remote_ip in remote_ips %} neighbor {{ remote_ip }} remote-as {{ asn }} neighbor {{ remote_ip }} description {{ asn }} + neighbor {{ remote_ip }} next-hop-self {% if remote_ip | ipv6 %} address-family ipv6 neighbor {{ remote_ip }} activate diff --git a/ansible/roles/eos/templates/t0-leaf-lag-2.j2 b/ansible/roles/eos/templates/t0-leaf-lag-2.j2 index 3e1d0f62d61..246cb22c6b9 100644 --- a/ansible/roles/eos/templates/t0-leaf-lag-2.j2 +++ b/ansible/roles/eos/templates/t0-leaf-lag-2.j2 @@ -106,6 +106,7 @@ router bgp {{ host['bgp']['asn'] }} {% for remote_ip in remote_ips %} neighbor {{ remote_ip }} remote-as {{ asn }} neighbor {{ remote_ip }} description {{ asn }} + neighbor {{ remote_ip }} next-hop-self {% if remote_ip | ipv6 %} address-family ipv6 neighbor {{ remote_ip }} activate diff --git a/ansible/roles/eos/templates/t0-leaf.j2 b/ansible/roles/eos/templates/t0-leaf.j2 index b13781177c5..f8483454ab0 100644 --- a/ansible/roles/eos/templates/t0-leaf.j2 +++ b/ansible/roles/eos/templates/t0-leaf.j2 @@ -106,6 +106,7 @@ router bgp {{ host['bgp']['asn'] }} {% for remote_ip in remote_ips %} neighbor {{ remote_ip }} remote-as {{ asn }} neighbor {{ remote_ip }} description {{ asn }} + neighbor {{ remote_ip }} next-hop-self {% if remote_ip | ipv6 %} address-family ipv6 neighbor {{ remote_ip }} activate diff --git a/ansible/roles/eos/templates/t0-mclag-leaf.j2 b/ansible/roles/eos/templates/t0-mclag-leaf.j2 index 0b6ec97538b..ca998aed03d 100644 --- a/ansible/roles/eos/templates/t0-mclag-leaf.j2 +++ b/ansible/roles/eos/templates/t0-mclag-leaf.j2 @@ -106,6 +106,7 @@ router bgp {{ host['bgp']['asn'] }} {% for remote_ip in remote_ips %} neighbor {{ remote_ip }} remote-as {{ asn }} neighbor {{ remote_ip }} description {{ asn }} + neighbor {{ remote_ip }} next-hop-self {% if remote_ip | ipv6 %} address-family ipv6 neighbor {{ remote_ip }} activate diff --git a/ansible/roles/eos/templates/t0-v6-leaf.j2 b/ansible/roles/eos/templates/t0-v6-leaf.j2 index 36239e28392..0b3838eacea 100644 --- a/ansible/roles/eos/templates/t0-v6-leaf.j2 +++ b/ansible/roles/eos/templates/t0-v6-leaf.j2 @@ -106,6 +106,7 @@ router bgp {{ host['bgp']['asn'] }} {% for remote_ip in remote_ips %} neighbor {{ remote_ip }} remote-as {{ asn }} neighbor {{ remote_ip }} description {{ asn }} + neighbor {{ remote_ip }} next-hop-self {% if remote_ip | ipv6 %} address-family ipv6 neighbor {{ remote_ip }} activate diff --git a/ansible/roles/eos/templates/t1-28-lag-spine.j2 b/ansible/roles/eos/templates/t1-28-lag-spine.j2 index 3e1d0f62d61..246cb22c6b9 100644 --- a/ansible/roles/eos/templates/t1-28-lag-spine.j2 +++ b/ansible/roles/eos/templates/t1-28-lag-spine.j2 @@ -106,6 +106,7 @@ router bgp {{ host['bgp']['asn'] }} {% for remote_ip in remote_ips %} neighbor {{ remote_ip }} remote-as {{ asn }} neighbor {{ remote_ip }} description {{ asn }} + neighbor {{ remote_ip }} next-hop-self {% if remote_ip | ipv6 %} address-family ipv6 neighbor {{ remote_ip }} activate diff --git a/ansible/roles/eos/templates/t1-28-lag-tor.j2 b/ansible/roles/eos/templates/t1-28-lag-tor.j2 index 5424ca361dc..37199ff6481 100644 --- a/ansible/roles/eos/templates/t1-28-lag-tor.j2 +++ b/ansible/roles/eos/templates/t1-28-lag-tor.j2 @@ -110,6 +110,7 @@ router bgp {{ host['bgp']['asn'] }} {% for remote_ip in remote_ips %} neighbor {{ remote_ip }} remote-as {{ asn }} neighbor {{ remote_ip }} description {{ asn }} + neighbor {{ remote_ip }} next-hop-self {% if remote_ip | ipv6 %} address-family ipv6 neighbor {{ remote_ip }} activate diff --git a/ansible/roles/eos/templates/t1-56-lag-tor.j2 b/ansible/roles/eos/templates/t1-56-lag-tor.j2 index be3dcc64397..c1010d108fb 100644 --- a/ansible/roles/eos/templates/t1-56-lag-tor.j2 +++ b/ansible/roles/eos/templates/t1-56-lag-tor.j2 @@ -110,6 +110,7 @@ router bgp {{ host['bgp']['asn'] }} {% for remote_ip in remote_ips %} neighbor {{ remote_ip }} remote-as {{ asn }} neighbor {{ remote_ip }} description {{ asn }} + neighbor {{ remote_ip }} next-hop-self {% if remote_ip | ipv6 %} address-family ipv6 neighbor {{ remote_ip }} activate diff --git a/ansible/roles/eos/templates/t1-64-lag-tor.j2 b/ansible/roles/eos/templates/t1-64-lag-tor.j2 index be3dcc64397..c1010d108fb 100644 --- a/ansible/roles/eos/templates/t1-64-lag-tor.j2 +++ b/ansible/roles/eos/templates/t1-64-lag-tor.j2 @@ -110,6 +110,7 @@ router bgp {{ host['bgp']['asn'] }} {% for remote_ip in remote_ips %} neighbor {{ remote_ip }} remote-as {{ asn }} neighbor {{ remote_ip }} description {{ asn }} + neighbor {{ remote_ip }} next-hop-self {% if remote_ip | ipv6 %} address-family ipv6 neighbor {{ remote_ip }} activate diff --git a/ansible/roles/eos/templates/t1-8-lag-spine.j2 b/ansible/roles/eos/templates/t1-8-lag-spine.j2 index b156e6d51d6..b83ca6a0db7 100644 --- a/ansible/roles/eos/templates/t1-8-lag-spine.j2 +++ b/ansible/roles/eos/templates/t1-8-lag-spine.j2 @@ -104,6 +104,7 @@ router bgp {{ host['bgp']['asn'] }} {% for remote_ip in remote_ips %} neighbor {{ remote_ip }} remote-as {{ asn }} neighbor {{ remote_ip }} description {{ asn }} + neighbor {{ remote_ip }} next-hop-self {% if remote_ip | ipv6 %} address-family ipv6 neighbor {{ remote_ip }} activate diff --git a/ansible/roles/eos/templates/t1-8-lag-tor.j2 b/ansible/roles/eos/templates/t1-8-lag-tor.j2 index 0becdfa2221..e84ecb67096 100644 --- a/ansible/roles/eos/templates/t1-8-lag-tor.j2 +++ b/ansible/roles/eos/templates/t1-8-lag-tor.j2 @@ -108,6 +108,7 @@ router bgp {{ host['bgp']['asn'] }} {% for remote_ip in remote_ips %} neighbor {{ remote_ip }} remote-as {{ asn }} neighbor {{ remote_ip }} description {{ asn }} + neighbor {{ remote_ip }} next-hop-self {% if remote_ip | ipv6 %} address-family ipv6 neighbor {{ remote_ip }} activate diff --git a/ansible/roles/eos/templates/t1-backend-tor.j2 b/ansible/roles/eos/templates/t1-backend-tor.j2 index 7f5b0e9e8dc..0240dfcdf0e 100644 --- a/ansible/roles/eos/templates/t1-backend-tor.j2 +++ b/ansible/roles/eos/templates/t1-backend-tor.j2 @@ -136,6 +136,7 @@ router bgp {{ host['bgp']['asn'] }} {% for remote_ip in remote_ips %} neighbor {{ remote_ip }} remote-as {{ asn }} neighbor {{ remote_ip }} description {{ asn }} + neighbor {{ remote_ip }} next-hop-self {% if remote_ip | ipv6 %} address-family ipv6 neighbor {{ remote_ip }} activate diff --git a/ansible/roles/eos/templates/t1-lag-spine.j2 b/ansible/roles/eos/templates/t1-lag-spine.j2 index c7f006de7c3..1e133ab3dd5 100644 --- a/ansible/roles/eos/templates/t1-lag-spine.j2 +++ b/ansible/roles/eos/templates/t1-lag-spine.j2 @@ -106,6 +106,7 @@ router bgp {{ host['bgp']['asn'] }} {% for remote_ip in remote_ips %} neighbor {{ remote_ip }} remote-as {{ asn }} neighbor {{ remote_ip }} description {{ asn }} + neighbor {{ remote_ip }} next-hop-self {% if remote_ip | ipv6 %} address-family ipv6 neighbor {{ remote_ip }} activate diff --git a/ansible/roles/eos/templates/t1-lag-tor.j2 b/ansible/roles/eos/templates/t1-lag-tor.j2 index 5b85edc34ad..48793369bcc 100644 --- a/ansible/roles/eos/templates/t1-lag-tor.j2 +++ b/ansible/roles/eos/templates/t1-lag-tor.j2 @@ -103,6 +103,7 @@ router bgp {{ host['bgp']['asn'] }} router-id {{ host['bgp']['router-id'] if host['bgp']['router-id'] is defined else host['interfaces']['Loopback0']['ipv4'] | ipaddr('address') }} neighbor {{ remote_ip }} remote-as {{ asn }} neighbor {{ remote_ip }} description {{ asn }} + neighbor {{ remote_ip }} next-hop-self {% if remote_ip | ipv6 %} address-family ipv6 neighbor {{ remote_ip }} activate diff --git a/ansible/roles/eos/templates/t1-smartswitch-ha-spine.j2 b/ansible/roles/eos/templates/t1-smartswitch-ha-spine.j2 index 0b6ec97538b..ca998aed03d 100644 --- a/ansible/roles/eos/templates/t1-smartswitch-ha-spine.j2 +++ b/ansible/roles/eos/templates/t1-smartswitch-ha-spine.j2 @@ -106,6 +106,7 @@ router bgp {{ host['bgp']['asn'] }} {% for remote_ip in remote_ips %} neighbor {{ remote_ip }} remote-as {{ asn }} neighbor {{ remote_ip }} description {{ asn }} + neighbor {{ remote_ip }} next-hop-self {% if remote_ip | ipv6 %} address-family ipv6 neighbor {{ remote_ip }} activate diff --git a/ansible/roles/eos/templates/t1-smartswitch-ha-tor.j2 b/ansible/roles/eos/templates/t1-smartswitch-ha-tor.j2 index 7abfa4c35ba..5536aa75780 100644 --- a/ansible/roles/eos/templates/t1-smartswitch-ha-tor.j2 +++ b/ansible/roles/eos/templates/t1-smartswitch-ha-tor.j2 @@ -109,6 +109,7 @@ router bgp {{ host['bgp']['asn'] }} {% for remote_ip in remote_ips %} neighbor {{ remote_ip }} remote-as {{ asn }} neighbor {{ remote_ip }} description {{ asn }} + neighbor {{ remote_ip }} next-hop-self {% if remote_ip | ipv6 %} address-family ipv6 neighbor {{ remote_ip }} activate diff --git a/ansible/roles/eos/templates/t2-core.j2 b/ansible/roles/eos/templates/t2-core.j2 index 0baebb7be49..2ec0e557672 100644 --- a/ansible/roles/eos/templates/t2-core.j2 +++ b/ansible/roles/eos/templates/t2-core.j2 @@ -126,6 +126,7 @@ router bgp {{ host['bgp']['asn'] }} neighbor {{ remote_ip }} remote-as {{ asn }} neighbor {{ remote_ip }} maximum-routes 0 neighbor {{ remote_ip }} description {{ asn }} + neighbor {{ remote_ip }} next-hop-self {% if remote_ip | ipv6 %} address-family ipv6 neighbor {{ remote_ip }} activate diff --git a/ansible/roles/eos/templates/t2-leaf.j2 b/ansible/roles/eos/templates/t2-leaf.j2 index 37da63bb634..78cbca2c725 100644 --- a/ansible/roles/eos/templates/t2-leaf.j2 +++ b/ansible/roles/eos/templates/t2-leaf.j2 @@ -114,6 +114,7 @@ router bgp {{ host['bgp']['asn'] }} neighbor {{ remote_ip }} maximum-routes 0 neighbor {{ remote_ip }} description {{ asn }} neighbor {{ remote_ip }} allowas-in + neighbor {{ remote_ip }} next-hop-self {% if remote_ip | ipv6 %} address-family ipv6 neighbor {{ remote_ip }} activate diff --git a/ansible/roles/eos/templates/t2-vs-core.j2 b/ansible/roles/eos/templates/t2-vs-core.j2 index 76b6ee32fba..12829bcfb88 100644 --- a/ansible/roles/eos/templates/t2-vs-core.j2 +++ b/ansible/roles/eos/templates/t2-vs-core.j2 @@ -113,6 +113,7 @@ router bgp {{ host['bgp']['asn'] }} neighbor {{ remote_ip }} remote-as {{ asn }} neighbor {{ remote_ip }} maximum-routes 0 neighbor {{ remote_ip }} description {{ asn }} + neighbor {{ remote_ip }} next-hop-self {% if remote_ip | ipv6 %} address-family ipv6 neighbor {{ remote_ip }} activate diff --git a/ansible/roles/eos/templates/t2-vs-leaf.j2 b/ansible/roles/eos/templates/t2-vs-leaf.j2 index 76b6ee32fba..12829bcfb88 100644 --- a/ansible/roles/eos/templates/t2-vs-leaf.j2 +++ b/ansible/roles/eos/templates/t2-vs-leaf.j2 @@ -113,6 +113,7 @@ router bgp {{ host['bgp']['asn'] }} neighbor {{ remote_ip }} remote-as {{ asn }} neighbor {{ remote_ip }} maximum-routes 0 neighbor {{ remote_ip }} description {{ asn }} + neighbor {{ remote_ip }} next-hop-self {% if remote_ip | ipv6 %} address-family ipv6 neighbor {{ remote_ip }} activate