Skip to content

Commit 1535759

Browse files
skaszlikmtarkingjuburnet
authored
Updating 'ebgp_vxlan_support' branch to be in sync with 'develop' (#502)
Updating ebgp_vxlan_support branch * Fix support boundary for security to be 12.2.2 or higher (#474) * fix support boundary for security to be 12.2.2 or higher * update in base * update in base * Update msd_fabric_general.j2 (#498) * Update msd_fabric_general.j2 * Update msd_fabric_resources.j2 * update defaults for breakout interface and nxapi and bootstrap defaults and isn fabric jinja template (#496) * update defaults for breakout and nxapi * updates multisite isn bootstrap and nxapi defaults --------- Co-authored-by: Matt Tarkington <mtarking@cisco.com> Co-authored-by: juburnet <145139118+juburnet@users.noreply.github.com>
1 parent 462511d commit 1535759

5 files changed

Lines changed: 30 additions & 15 deletions

File tree

‎roles/dtc/common/templates/ndfc_fabric/isn_fabric/advanced/isn_fabric_advanced.j2‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
MPLS_HANDOFF: false
77
AAA_REMOTE_IP_ENABLED: false
88
INBAND_MGMT: false
9-
{% if vxlan.global.bootstrap is defined and vxlan.global.bootstrap.enable_cdp_mgmt is defined %}
10-
CDP_ENABLE: {{ vxlan.global.bootstrap.enable_cdp_mgmt }}
9+
{% if vxlan.multisite.isn.bootstrap is defined and vxlan.multisite.isn.bootstrap.enable_cdp_mgmt is defined %}
10+
CDP_ENABLE: {{ vxlan.multisite.isn.bootstrap.enable_cdp_mgmt }}
1111
{% endif %}
12-
ENABLE_NXAPI: {{ vxlan.multisite.isn.enable_nxapi_https | default(defaults.vxlan.global.enable_nxapi_https) }}
13-
{% if vxlan.multisite.isn.enable_nxapi_https | default(defaults.vxlan.global.enable_nxapi_https) %}
14-
NXAPI_HTTPS_PORT: {{ vxlan.multisite.isn.nxapi_https_port | default(defaults.vxlan.global.nxapi_https_port) }}
12+
ENABLE_NXAPI: {{ vxlan.multisite.isn.enable_nxapi_https | default(defaults.vxlan.multisite.isn.enable_nxapi_https) }}
13+
{% if vxlan.multisite.isn.enable_nxapi_https | default(defaults.vxlan.multisite.isn.enable_nxapi_https) %}
14+
NXAPI_HTTPS_PORT: {{ vxlan.multisite.isn.nxapi_https_port | default(defaults.vxlan.multisite.isn.nxapi_https_port) }}
1515
{% endif %}
16-
ENABLE_NXAPI_HTTP: {{ vxlan.multisite.isn.enable_nxapi_http | default(defaults.vxlan.global.enable_nxapi_http) }}
17-
{% if vxlan.multisite.isn.enable_nxapi_http | default(defaults.vxlan.global.enable_nxapi_http) %}
18-
NXAPI_HTTP_PORT: {{ vxlan.multisite.isn.nxapi_http_port | default(defaults.vxlan.global.nxapi_http_port) }}
16+
ENABLE_NXAPI_HTTP: {{ vxlan.multisite.isn.enable_nxapi_http | default(defaults.vxlan.multisite.isn.enable_nxapi_http) }}
17+
{% if vxlan.multisite.isn.enable_nxapi_http | default(defaults.vxlan.multisite.isn.enable_nxapi_http) %}
18+
NXAPI_HTTP_PORT: {{ vxlan.multisite.isn.nxapi_http_port | default(defaults.vxlan.multisite.isn.nxapi_http_port) }}
1919
{% endif %}
2020
FEATURE_PTP: {{ vxlan.global.ptp.enable | default(defaults.vxlan.global.ptp.enable) }}
2121
{% if vxlan.global.ptp.enable | default(defaults.vxlan.global.ptp.enable) %}

‎roles/dtc/common/templates/ndfc_fabric/msd_fabric/general/msd_fabric_general.j2‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{# Auto-generated NDFC MSD General config data structure for fabric {{ vxlan.fabric.name }} #}
2+
{% if ndfc_version | cisco.nac_dc_vxlan.version_compare('12.2.2', '>=') %}
23
VXLAN_UNDERLAY_IS_V6: {{ vxlan.multisite.enable_ipv6_underlay | default(defaults.vxlan.multisite.enable_ipv6_underlay) }}
3-
{% if (vxlan.multisite.enable_ipv6_underlay | default(defaults.vxlan.multisite.enable_ipv6_underlay) | ansible.builtin.bool) is sameas false %}
4+
{% endif %}
5+
{% if not (vxlan.multisite.enable_ipv6_underlay | default(defaults.vxlan.multisite.enable_ipv6_underlay) | ansible.builtin.bool) %}
46
ENABLE_PVLAN: false
57
{% endif %}
68
ANYCAST_GW_MAC: {{ vxlan.multisite.anycast_gateway_mac | default(defaults.vxlan.multisite.anycast_gateway_mac) }}
@@ -35,4 +37,4 @@
3537
{% set l3_vni_range = defaults.vxlan.global.layer3_vni_range.from ~ '-' ~ defaults.vxlan.global.layer3_vni_range.to %}
3638
{% endif %}
3739
L3_PARTITION_ID_RANGE: {{ l3_vni_range }}
38-
{# #}
40+
{# #}

‎roles/dtc/common/templates/ndfc_fabric/msd_fabric/msd_fabric_base.j2‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
{# Include NDFC DC VXLAN EVPN DCI Template #}
1010
{% include '/ndfc_fabric/msd_fabric/dci/msd_fabric_dci.j2' %}
1111

12-
{# Include NDFC DC VXLAN EVPN Security Template #}
12+
{% if ndfc_version | cisco.nac_dc_vxlan.version_compare('12.2.2', '>=') %}
13+
{# Include NDFC MSD Security Template #}
1314
{% include '/ndfc_fabric/msd_fabric/security/msd_fabric_security.j2' %}
15+
{% endif %}
1416

1517
{# Include NDFC DC VXLAN EVPN Resources Template #}
1618
{% include '/ndfc_fabric/msd_fabric/resources/msd_fabric_resources.j2' %}

‎roles/dtc/common/templates/ndfc_fabric/msd_fabric/resources/msd_fabric_resources.j2‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
{# Auto-generated NDFC MSD Resources config data structure for fabric {{ vxlan.fabric.name }} #}
2-
{% if (vxlan.multisite.enable_ipv6_underlay | default(defaults.vxlan.multisite.enable_ipv6_underlay) | ansible.builtin.bool) is sameas false %}
2+
{% if not (vxlan.multisite.enable_ipv6_underlay | default(defaults.vxlan.multisite.enable_ipv6_underlay) | ansible.builtin.bool) %}
33
LOOPBACK100_IP_RANGE: {{ vxlan.multisite.ipv4_vtep_loopback_range | default(defaults.vxlan.multisite.ipv4_vtep_loopback_range) }}
44
DCI_SUBNET_RANGE: {{ vxlan.multisite.overlay_dci.ipv4_dci_subnet_range | default(defaults.vxlan.multisite.overlay_dci.ipv4_dci_subnet_range) }}
55
DCI_SUBNET_TARGET_MASK: {{ vxlan.multisite.overlay_dci.ipv4_dci_subnet_mask | default(defaults.vxlan.multisite.overlay_dci.ipv4_dci_subnet_mask) }}
6-
{% else %}
6+
{% endif %}
7+
{% if ( (ndfc_version | cisco.nac_dc_vxlan.version_compare('12.2.2', '>=')) and
8+
(vxlan.multisite.enable_ipv6_underlay | default(defaults.vxlan.multisite.enable_ipv6_underlay) | ansible.builtin.bool) ) %}
79
LOOPBACK100_IPV6_RANGE: {{ vxlan.multisite.ipv6_vtep_loopback_range | default(defaults.vxlan.multisite.ipv6_vtep_loopback_range) }}
810
V6_DCI_SUBNET_RANGE: {{ vxlan.multisite.overlay_dci.ipv6_dci_subnet_range | default(defaults.vxlan.multisite.overlay_dci.ipv6_dci_subnet_range) }}
911
V6_DCI_SUBNET_TARGET_MASK: {{ vxlan.multisite.overlay_dci.ipv6_dci_subnet_mask | default(defaults.vxlan.multisite.overlay_dci.ipv6_dci_subnet_mask) }}
10-
{% endif %}
12+
{% endif %}

‎roles/validate/files/defaults.yml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ factory_defaults:
5757
domain_id_range: 1-1000
5858
fabric_vpc_qos: false
5959
fabric_vpc_qos_policy_name: spine_qos_for_fabric_vpc_peering
60-
enable_ipv6_nd_sync: true
6160
spanning_tree:
6261
root_bridge_protocol: unmanaged
6362
vlan_range:
@@ -81,6 +80,12 @@ factory_defaults:
8180
switches:
8281
routing_loopback_id: 0
8382
vtep_loopback_id: 1
83+
interface_breakouts:
84+
module: 1
85+
from: 1
86+
to: 1
87+
map: '10g-4x'
88+
enable_during_bootstrap: false
8489
interfaces:
8590
topology_switch_access_interface:
8691
description: "NetAsCode Access Interface"
@@ -386,6 +391,10 @@ factory_defaults:
386391
enable_trm: false
387392
isn:
388393
sub_int_range: 2-511
394+
enable_nxapi_http: false
395+
nxapi_http_port: 80
396+
enable_nxapi_https: true
397+
nxapi_https_port: 443
389398
bootstrap:
390399
enable_bootstrap: false
391400
enable_local_dhcp_server: false

0 commit comments

Comments
 (0)