From 56c23687a469888d4f2fbde17bf99546e5f1ba31 Mon Sep 17 00:00:00 2001 From: "J. Andres Rocha Bravo" Date: Fri, 27 Jun 2025 14:52:07 -0600 Subject: [PATCH 1/2] Adding greenfield cleanup option --- .../dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2 | 2 +- roles/validate/files/defaults.yml | 1 + 2 files changed, 2 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 7e704713..8445c180 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 @@ -1,6 +1,6 @@ {# Auto-generated NDFC DC VXLAN EVPN Advanced config data structure for fabric {{ vxlan.fabric.name }} #} OVERLAY_MODE: cli - GRFIELD_DEBUG_FLAG: Enable + GRFIELD_DEBUG_FLAG: {{ vxlan.global.greenfield_cleanup | default(defaults.vxlan.global.greenfield_cleanup) }} ENABLE_PVLAN: false AAA_REMOTE_IP_ENABLED: False {% if not (vxlan.underlay.general.enable_ipv6_underlay | default(defaults.vxlan.underlay.general.enable_ipv6_underlay) | ansible.builtin.bool) %} diff --git a/roles/validate/files/defaults.yml b/roles/validate/files/defaults.yml index 34c90fbe..2c2f4507 100644 --- a/roles/validate/files/defaults.yml +++ b/roles/validate/files/defaults.yml @@ -30,6 +30,7 @@ factory_defaults: nxapi_http_port: 80 enable_nxapi_https: true nxapi_https_port: 443 + greenfield_cleanup: Enable layer2_vni_range: from: 30000 to: 49000 From 0675370d4fa1a0f0c352f7c4109068edf4c14ea7 Mon Sep 17 00:00:00 2001 From: "J. Andres Rocha Bravo" Date: Wed, 10 Sep 2025 17:54:09 -0600 Subject: [PATCH 2/2] moving greenfield_cleanup under ibgp and ebgp --- .../dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2 | 2 +- .../ebgp_vxlan_fabric/advanced/ebgp_vxlan_fabric_advanced.j2 | 2 +- roles/validate/files/defaults.yml | 1 + 3 files changed, 3 insertions(+), 2 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 05c8c685..41e9f257 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 @@ -1,6 +1,6 @@ {# Auto-generated NDFC DC VXLAN EVPN Advanced config data structure for fabric {{ vxlan.fabric.name }} #} OVERLAY_MODE: {{ vxlan.global.ibgp.overlay_mode | default(defaults.vxlan.global.ibgp.overlay_mode) }} - GRFIELD_DEBUG_FLAG: {{ vxlan.global.greenfield_cleanup | default(defaults.vxlan.global.greenfield_cleanup) }} + GRFIELD_DEBUG_FLAG: {{ vxlan.global.ibgp.greenfield_cleanup | default(defaults.vxlan.global.ibgp.greenfield_cleanup) }} ENABLE_PVLAN: false AAA_REMOTE_IP_ENABLED: False {% if ndfc_version | cisco.nac_dc_vxlan.version_compare('12.2.2', '>=') and ndfc_version | cisco.nac_dc_vxlan.version_compare('12.4.1', '<') %} diff --git a/roles/dtc/common/templates/ndfc_fabric/ebgp_vxlan_fabric/advanced/ebgp_vxlan_fabric_advanced.j2 b/roles/dtc/common/templates/ndfc_fabric/ebgp_vxlan_fabric/advanced/ebgp_vxlan_fabric_advanced.j2 index 3428cbb4..8cf8eadc 100644 --- a/roles/dtc/common/templates/ndfc_fabric/ebgp_vxlan_fabric/advanced/ebgp_vxlan_fabric_advanced.j2 +++ b/roles/dtc/common/templates/ndfc_fabric/ebgp_vxlan_fabric/advanced/ebgp_vxlan_fabric_advanced.j2 @@ -1,5 +1,5 @@ {# Auto-generated NDFC eBGP VXLAN EVPN Advanced config data structure for fabric {{ vxlan.fabric.name }} #} - GRFIELD_DEBUG_FLAG: Enable + GRFIELD_DEBUG_FLAG: {{ vxlan.global.ebgp.greenfield_cleanup | default(defaults.vxlan.global.ebgp.greenfield_cleanup) }} ENABLE_PVLAN: false AAA_REMOTE_IP_ENABLED: False FABRIC_MTU: {{ vxlan.underlay.general.intra_fabric_interface_mtu | default(defaults.vxlan.underlay.general.intra_fabric_interface_mtu) }} diff --git a/roles/validate/files/defaults.yml b/roles/validate/files/defaults.yml index aeaced57..f7c33e3b 100644 --- a/roles/validate/files/defaults.yml +++ b/roles/validate/files/defaults.yml @@ -33,6 +33,7 @@ factory_defaults: enable_nxapi_https: true nxapi_https_port: 443 overlay_mode: cli + greenfield_cleanup: Disable layer2_vni_range: from: 30000 to: 49000