From 2e632792e13e6e103997bb7afda83939ccd5f9c4 Mon Sep 17 00:00:00 2001 From: davidc0le Date: Mon, 14 Feb 2022 16:29:20 +0000 Subject: [PATCH 1/2] Send fallbackToClosest as a boolean instead of a string --- .../ansible/roles/dataset_loader/templates/cachegroup.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure/ansible/roles/dataset_loader/templates/cachegroup.j2 b/infrastructure/ansible/roles/dataset_loader/templates/cachegroup.j2 index 58fb45d441..6d718dc371 100644 --- a/infrastructure/ansible/roles/dataset_loader/templates/cachegroup.j2 +++ b/infrastructure/ansible/roles/dataset_loader/templates/cachegroup.j2 @@ -13,7 +13,7 @@ #} { {% if item.fallbackToClosest is defined and item.fallbackToClosest is not none %} - "fallbackToClosest": "{{ item.fallbackToClosest }}", + "fallbackToClosest": {{ item.fallbackToClosest }}, {% endif %} {% if item.latitude is defined and item.latitude is not none %} "latitude": {{ item.latitude }}, From a361b10176ded601ecab8808fae6d74dfeb5a52b Mon Sep 17 00:00:00 2001 From: davidc0le Date: Tue, 15 Feb 2022 17:25:43 +0000 Subject: [PATCH 2/2] Adding changelog entry for PR --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3634127707..687717d9a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - Fixed a cdn-in-a-box build issue when using `RHEL_VERSION=7` - [#6549](https://github.com/apache/trafficcontrol/issues/6549) Fixed internal server error while deleting a delivery service created from a DSR (Traafic Ops). - [#6538](https://github.com/apache/trafficcontrol/pull/6538) Fixed the incorrect use of secure.port on TrafficRouter and corrected to the httpsPort value from the TR server configuration. +- [#6562](https://github.com/apache/trafficcontrol/pull/6562) Fixed incorrect template in Ansible dataset loader role when fallbackToClosest is defined. ### Removed - Remove traffic_portal dependencies to mitigate `npm audit` issues, specifically `grunt-concurrent`, `grunt-contrib-concat`, `grunt-contrib-cssmin`, `grunt-contrib-jsmin`, `grunt-contrib-uglify`, `grunt-contrib-htmlmin`, `grunt-newer`, and `grunt-wiredep`