[trafficcontrol] branch master updated: Add http_polling_format defaults and set to json via automation (#5348)

[jh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jhg03a pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git


The following commit(s) were added to refs/heads/master by this push:
     new cdd09ef  Add http_polling_format defaults and set to json via automation (#5348)
cdd09ef is described below

commit cdd09efdf1e90bda02120e01992265899d049996
Author: Evan Zelkowitz <ez...@apache.org>
AuthorDate: Thu Dec 3 14:31:07 2020 -0700

    Add http_polling_format defaults and set to json via automation (#5348)
    
    * Add http_polling_format defaults and set to json
---
 infrastructure/ansible/roles/traffic-monitor/defaults/main.yml           | 1 +
 .../ansible/roles/traffic-monitor/templates/traffic_monitor.cfg.j2       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/infrastructure/ansible/roles/traffic-monitor/defaults/main.yml b/infrastructure/ansible/roles/traffic-monitor/defaults/main.yml
index 927b49d..da7da69 100644
--- a/infrastructure/ansible/roles/traffic-monitor/defaults/main.yml
+++ b/infrastructure/ansible/roles/traffic-monitor/defaults/main.yml
@@ -43,6 +43,7 @@ tm_stat_flush_interval_ms: 20
 tm_serve_read_timeout_ms: 10000
 tm_serve_write_timeout_ms: 10000
 tm_http_poll_no_sleep: false
+tm_http_polling_format: "text/json"
 tm_to_min_retry_interval: 100
 tm_to_max_retry_interval: 60000
 tm_static_file_dir: "{{ tm_base_dir}}/static"
diff --git a/infrastructure/ansible/roles/traffic-monitor/templates/traffic_monitor.cfg.j2 b/infrastructure/ansible/roles/traffic-monitor/templates/traffic_monitor.cfg.j2
index fa2a9a3..18650de 100644
--- a/infrastructure/ansible/roles/traffic-monitor/templates/traffic_monitor.cfg.j2
+++ b/infrastructure/ansible/roles/traffic-monitor/templates/traffic_monitor.cfg.j2
@@ -31,6 +31,7 @@
         "serve_read_timeout_ms": {{ tm_serve_read_timeout_ms }},
         "serve_write_timeout_ms": {{ tm_serve_write_timeout_ms }},
         "http_poll_no_sleep": {{ tm_http_poll_no_sleep | lower }},
+        "http_polling_format": {{ tm_http_polling_format }},
         "traffic_ops_min_retry_interval_ms": {{ tm_to_min_retry_interval }},
         "traffic_ops_max_retry_interval_ms": {{ tm_to_max_retry_interval }},
         "static_file_dir": "{{ tm_static_file_dir }}"