From 06d576540a1c7a5ce4c9b4c01e8e6fd11c31fd67 Mon Sep 17 00:00:00 2001 From: Charly Coueffe <75327499+ccoueffe@users.noreply.github.com> Date: Mon, 1 Sep 2025 14:19:53 +0200 Subject: [PATCH 1/7] Update dc_vxlan_fabric_advanced.j2 --- .../dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2 b/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2 index a14a06d12..e33a61f7e 100644 --- a/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2 +++ b/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2 @@ -2,7 +2,7 @@ OVERLAY_MODE: cli GRFIELD_DEBUG_FLAG: Enable ENABLE_PVLAN: false - AAA_REMOTE_IP_ENABLED: False + AAA_REMOTE_IP_ENABLED: {{ vxlan.global.ibgp.enable_aaa_remote_ip | default(defaults.vxlan.global.ibgp.enable_aaa_remote_ip }} TCAM_ALLOCATION: {{ vxlan.global.ibgp.tcam_allocation | default(defaults.vxlan.global.ibgp.tcam_allocation) }} {% if not (vxlan.underlay.general.enable_ipv6_underlay | default(defaults.vxlan.underlay.general.enable_ipv6_underlay) | ansible.builtin.bool) %} FEATURE_PTP: {{ vxlan.global.ptp.enable | default(defaults.vxlan.global.ptp.enable) }} @@ -41,3 +41,10 @@ STP_BRIDGE_PRIORITY: {{ vxlan.global.spanning_tree.bridge_priority | default(defaults.vxlan.global.spanning_tree.bridge_priority) }} {% endif %} {% endif %} + POWER_REDUNDANCY_MODEL: {{ vxlan.global.ibgp.power_redundancy | default(defaults.vxlan.global.ibgp.power_redundancy }} + COPP_POLICY: {{ vxlan.global.ibgp.copp_policy | default(defaults.vxlan.global.ibgp.copp_policy }} + HD_TIME: {{ vxlan.global.ibgp.vtep_holddown_time | default(defaults.vxlan.global.ibgp.vtep_holddown_time }} + ENABLE_NGOAM: {{ vxlan.global.ibgp.enable_ngoam | default(defaults.vxlan.global.ibgp.enable_ngoam }} + ENABLE_TENANT_DHCP: {{ vxlan.global.ibgp.enable_tenant_dhcp | default(defaults.vxlan.global.ibgp.enable_tenant_dhcp }} + STRICT_CC_MODE: {{ vxlan.global.ibgp.strict_config_compliance | default(defaults.vxlan.global.ibgp.strict_config_compliance }} + ENABLE_DEFAULT_QUEUING_POLICY: {{ vxlan.global.ibgp.enable_default_queuing_policy | default(defaults.vxlan.global.ibgp.enable_default_queuing_policy }} From 6d98d01fd08f8475b6a12def5e11630be9970a31 Mon Sep 17 00:00:00 2001 From: Charly Coueffe <75327499+ccoueffe@users.noreply.github.com> Date: Mon, 1 Sep 2025 14:22:36 +0200 Subject: [PATCH 2/7] Update dc_vxlan_fabric_resources.j2 --- .../dc_vxlan_fabric/resources/dc_vxlan_fabric_resources.j2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/resources/dc_vxlan_fabric_resources.j2 b/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/resources/dc_vxlan_fabric_resources.j2 index 2a43e733d..1550d882e 100644 --- a/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/resources/dc_vxlan_fabric_resources.j2 +++ b/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/resources/dc_vxlan_fabric_resources.j2 @@ -76,3 +76,6 @@ {% set l3_vlan_range = defaults.vxlan.global.layer3_vlan_range.from ~ '-' ~ defaults.vxlan.global.layer3_vlan_range.to %} {% endif %} VRF_VLAN_RANGE: {{ l3_vlan_range }} + AUTO_UNIQUE_VRF_LITE_IP_PREFIX: {{ vxlan.global.ibgp.auto_unique_vrflite_ip_prefix | default(defaults.vxlan.global.ibgp.auto_unique_vrflite_ip_prefix }} + PER_VRF_LOOPBACK_AUTO_PROVISION: {{ vxlan.global.ibgp.per_vrf_loopback_v4_auto_provision | default(defaults.vxlan.global.ibgp.per_vrf_loopback_v4_auto_provision }} + SUBINTERFACE_RANGE: {{ vxlan.global.ibgp.sub_int_range | default(defaults.vxlan.global.ibgp.sub_int_range }} From 6ecca27f9cc675353a0122b92b6053e9decf2915 Mon Sep 17 00:00:00 2001 From: Charly Coueffe <75327499+ccoueffe@users.noreply.github.com> Date: Mon, 1 Sep 2025 14:25:08 +0200 Subject: [PATCH 3/7] Update defaults.yml --- roles/validate/files/defaults.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/roles/validate/files/defaults.yml b/roles/validate/files/defaults.yml index 601cc3e0e..b8f0a54fd 100644 --- a/roles/validate/files/defaults.yml +++ b/roles/validate/files/defaults.yml @@ -28,6 +28,17 @@ factory_defaults: leaf_same_bgp_asn: false ibgp: tcam_allocation: true + power_redundancy: ps-redundant + copp_policy: strict + vtep_holddown_time: 180 + enable_ngoam: true + enable_tenant_dhcp: true + strict_config_compliance: false + enable_aaa_remote_ip: false + enable_default_queuing_policy: false + sub_int_range: 2-511 + auto_unique_vrflite_ip_prefix: false + per_vrf_loopback_v4_auto_provision: false route_reflectors: 2 anycast_gateway_mac: 20:20:00:00:00:aa auth_proto: MD5 From e24c54908bb66a5d16209859c7f6c8879c083c33 Mon Sep 17 00:00:00 2001 From: Charly Coueffe <75327499+ccoueffe@users.noreply.github.com> Date: Mon, 1 Sep 2025 14:47:10 +0200 Subject: [PATCH 4/7] Update dc_vxlan_fabric_advanced.j2 --- .../advanced/dc_vxlan_fabric_advanced.j2 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2 b/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2 index e33a61f7e..3c086da64 100644 --- a/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2 +++ b/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2 @@ -2,7 +2,7 @@ OVERLAY_MODE: cli GRFIELD_DEBUG_FLAG: Enable ENABLE_PVLAN: false - AAA_REMOTE_IP_ENABLED: {{ vxlan.global.ibgp.enable_aaa_remote_ip | default(defaults.vxlan.global.ibgp.enable_aaa_remote_ip }} + AAA_REMOTE_IP_ENABLED: {{ vxlan.global.ibgp.enable_aaa_remote_ip | default(defaults.vxlan.global.ibgp.enable_aaa_remote_ip) }} TCAM_ALLOCATION: {{ vxlan.global.ibgp.tcam_allocation | default(defaults.vxlan.global.ibgp.tcam_allocation) }} {% if not (vxlan.underlay.general.enable_ipv6_underlay | default(defaults.vxlan.underlay.general.enable_ipv6_underlay) | ansible.builtin.bool) %} FEATURE_PTP: {{ vxlan.global.ptp.enable | default(defaults.vxlan.global.ptp.enable) }} @@ -41,10 +41,10 @@ STP_BRIDGE_PRIORITY: {{ vxlan.global.spanning_tree.bridge_priority | default(defaults.vxlan.global.spanning_tree.bridge_priority) }} {% endif %} {% endif %} - POWER_REDUNDANCY_MODEL: {{ vxlan.global.ibgp.power_redundancy | default(defaults.vxlan.global.ibgp.power_redundancy }} - COPP_POLICY: {{ vxlan.global.ibgp.copp_policy | default(defaults.vxlan.global.ibgp.copp_policy }} - HD_TIME: {{ vxlan.global.ibgp.vtep_holddown_time | default(defaults.vxlan.global.ibgp.vtep_holddown_time }} - ENABLE_NGOAM: {{ vxlan.global.ibgp.enable_ngoam | default(defaults.vxlan.global.ibgp.enable_ngoam }} - ENABLE_TENANT_DHCP: {{ vxlan.global.ibgp.enable_tenant_dhcp | default(defaults.vxlan.global.ibgp.enable_tenant_dhcp }} - STRICT_CC_MODE: {{ vxlan.global.ibgp.strict_config_compliance | default(defaults.vxlan.global.ibgp.strict_config_compliance }} - ENABLE_DEFAULT_QUEUING_POLICY: {{ vxlan.global.ibgp.enable_default_queuing_policy | default(defaults.vxlan.global.ibgp.enable_default_queuing_policy }} + POWER_REDUNDANCY_MODEL: {{ vxlan.global.ibgp.power_redundancy | default(defaults.vxlan.global.ibgp.power_redundancy) }} + COPP_POLICY: {{ vxlan.global.ibgp.copp_policy | default(defaults.vxlan.global.ibgp.copp_policy) }} + HD_TIME: {{ vxlan.global.ibgp.vtep_holddown_time | default(defaults.vxlan.global.ibgp.vtep_holddown_time) }} + ENABLE_NGOAM: {{ vxlan.global.ibgp.enable_ngoam | default(defaults.vxlan.global.ibgp.enable_ngoam) }} + ENABLE_TENANT_DHCP: {{ vxlan.global.ibgp.enable_tenant_dhcp | default(defaults.vxlan.global.ibgp.enable_tenant_dhcp) }} + STRICT_CC_MODE: {{ vxlan.global.ibgp.strict_config_compliance | default(defaults.vxlan.global.ibgp.strict_config_compliance) }} + ENABLE_DEFAULT_QUEUING_POLICY: {{ vxlan.global.ibgp.enable_default_queuing_policy | default(defaults.vxlan.global.ibgp.enable_default_queuing_policy) }} From 3168aa4c73014914a7008886369ac9fd90d212f1 Mon Sep 17 00:00:00 2001 From: Charly Coueffe <75327499+ccoueffe@users.noreply.github.com> Date: Mon, 1 Sep 2025 14:47:43 +0200 Subject: [PATCH 5/7] Update dc_vxlan_fabric_resources.j2 --- .../dc_vxlan_fabric/resources/dc_vxlan_fabric_resources.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/resources/dc_vxlan_fabric_resources.j2 b/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/resources/dc_vxlan_fabric_resources.j2 index 1550d882e..295466448 100644 --- a/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/resources/dc_vxlan_fabric_resources.j2 +++ b/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/resources/dc_vxlan_fabric_resources.j2 @@ -76,6 +76,6 @@ {% set l3_vlan_range = defaults.vxlan.global.layer3_vlan_range.from ~ '-' ~ defaults.vxlan.global.layer3_vlan_range.to %} {% endif %} VRF_VLAN_RANGE: {{ l3_vlan_range }} - AUTO_UNIQUE_VRF_LITE_IP_PREFIX: {{ vxlan.global.ibgp.auto_unique_vrflite_ip_prefix | default(defaults.vxlan.global.ibgp.auto_unique_vrflite_ip_prefix }} - PER_VRF_LOOPBACK_AUTO_PROVISION: {{ vxlan.global.ibgp.per_vrf_loopback_v4_auto_provision | default(defaults.vxlan.global.ibgp.per_vrf_loopback_v4_auto_provision }} - SUBINTERFACE_RANGE: {{ vxlan.global.ibgp.sub_int_range | default(defaults.vxlan.global.ibgp.sub_int_range }} + AUTO_UNIQUE_VRF_LITE_IP_PREFIX: {{ vxlan.global.ibgp.auto_unique_vrflite_ip_prefix | default(defaults.vxlan.global.ibgp.auto_unique_vrflite_ip_prefix) }} + PER_VRF_LOOPBACK_AUTO_PROVISION: {{ vxlan.global.ibgp.per_vrf_loopback_v4_auto_provision | default(defaults.vxlan.global.ibgp.per_vrf_loopback_v4_auto_provision) }} + SUBINTERFACE_RANGE: {{ vxlan.global.ibgp.sub_int_range | default(defaults.vxlan.global.ibgp.sub_int_range) }} From 3f72f22074906d2b4e377ed3f956a6c885a37439 Mon Sep 17 00:00:00 2001 From: Charly Coueffe <75327499+ccoueffe@users.noreply.github.com> Date: Mon, 1 Sep 2025 15:24:34 +0200 Subject: [PATCH 6/7] Update dc_vxlan_fabric_advanced.j2 --- .../dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2 b/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2 index 3c086da64..9770a2c6d 100644 --- a/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2 +++ b/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2 @@ -41,7 +41,7 @@ STP_BRIDGE_PRIORITY: {{ vxlan.global.spanning_tree.bridge_priority | default(defaults.vxlan.global.spanning_tree.bridge_priority) }} {% endif %} {% endif %} - POWER_REDUNDANCY_MODEL: {{ vxlan.global.ibgp.power_redundancy | default(defaults.vxlan.global.ibgp.power_redundancy) }} + POWER_REDUNDANCY_MODE: {{ vxlan.global.ibgp.power_redundancy | default(defaults.vxlan.global.ibgp.power_redundancy) }} COPP_POLICY: {{ vxlan.global.ibgp.copp_policy | default(defaults.vxlan.global.ibgp.copp_policy) }} HD_TIME: {{ vxlan.global.ibgp.vtep_holddown_time | default(defaults.vxlan.global.ibgp.vtep_holddown_time) }} ENABLE_NGOAM: {{ vxlan.global.ibgp.enable_ngoam | default(defaults.vxlan.global.ibgp.enable_ngoam) }} From f2ab93977958a540e60ef42eefe5cda5c579c8a0 Mon Sep 17 00:00:00 2001 From: Charly Coueffe <75327499+ccoueffe@users.noreply.github.com> Date: Tue, 9 Sep 2025 18:36:52 +0200 Subject: [PATCH 7/7] Update dc_vxlan_fabric_resources.j2 --- .../dc_vxlan_fabric/resources/dc_vxlan_fabric_resources.j2 | 2 -- 1 file changed, 2 deletions(-) diff --git a/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/resources/dc_vxlan_fabric_resources.j2 b/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/resources/dc_vxlan_fabric_resources.j2 index 63b1cbf2c..59015f492 100644 --- a/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/resources/dc_vxlan_fabric_resources.j2 +++ b/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/resources/dc_vxlan_fabric_resources.j2 @@ -76,6 +76,4 @@ {% set l3_vlan_range = defaults.vxlan.global.ibgp.layer3_vlan_range.from ~ '-' ~ defaults.vxlan.global.ibgp.layer3_vlan_range.to %} {% endif %} VRF_VLAN_RANGE: {{ l3_vlan_range }} - AUTO_UNIQUE_VRF_LITE_IP_PREFIX: {{ vxlan.global.ibgp.auto_unique_vrflite_ip_prefix | default(defaults.vxlan.global.ibgp.auto_unique_vrflite_ip_prefix) }} - PER_VRF_LOOPBACK_AUTO_PROVISION: {{ vxlan.global.ibgp.per_vrf_loopback_v4_auto_provision | default(defaults.vxlan.global.ibgp.per_vrf_loopback_v4_auto_provision) }} SUBINTERFACE_RANGE: {{ vxlan.global.ibgp.sub_int_range | default(defaults.vxlan.global.ibgp.sub_int_range) }}