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 4104f7ffec Changes to Ansible role dataset_loader to add ATS 9 support
(#7665)
4104f7ffec is described below
commit 4104f7ffec7544ef0276f4105863466d7c87cb9a
Author: Alexander Cabinian
<[email protected]>
AuthorDate: Tue Aug 1 18:03:22 2023 -0400
Changes to Ansible role dataset_loader to add ATS 9 support (#7665)
* Changes to dataset_loader main.yml to add ATS 9 support
* Changelog entry for PR 7665
* Changes to comments, omitting one param after PR feedback
* Removed proxy.config.net.sock_option_flag_in in ATS 8/9 sections,
proxy.config.ssl.handshake_timeout_in to take default for each ATS version
* Removed proxy.config.ssl.handshake_timeout_in from ATS 9 section
---
CHANGELOG.md | 1 +
.../ansible/roles/dataset_loader/defaults/main.yml | 101 +++++++++++++++++----
2 files changed, 82 insertions(+), 20 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48d38885cd..f53d73b845 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ All notable changes to this project will be documented in this
file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
## [unreleased]
+- [#7665](https://github.com/apache/trafficcontrol/pull/7665) *Automation*
Changes to Ansible role dataset_loader to add ATS 9 support
### Added
- [#7609](https://github.com/apache/trafficcontrol/pull/7609) *Traffic Portal*
Added Scope Query Param to SSO login.
- [#7450](https://github.com/apache/trafficcontrol/pull/7450) *Traffic Ops*
Removed hypnotoad section and added listen field to traffic_ops_golang section
in order to simplify cdn config.
diff --git a/infrastructure/ansible/roles/dataset_loader/defaults/main.yml
b/infrastructure/ansible/roles/dataset_loader/defaults/main.yml
index ccb83c2a94..734719168c 100644
--- a/infrastructure/ansible/roles/dataset_loader/defaults/main.yml
+++ b/infrastructure/ansible/roles/dataset_loader/defaults/main.yml
@@ -671,7 +671,7 @@ dl_ds_default_profiles:
value: tps_total
secure: 0
-dl_ds_ats_major_version: "{{ 8 if dl_ats_version is version('8','>=') else 7
}}"
+dl_ds_ats_major_version: "{{ 9 if dl_ats_version is version('9','>=') else 8
if dl_ats_version is version('8', '>=') else 7 }}"
# ATS Profiles are huge, we should normalize them a big to make them more
understandable
dl_ds_default_profile_layers:
@@ -696,9 +696,6 @@ dl_ds_default_profile_layers:
- name: CONFIG proxy.config.cache.hostdb.sync_frequency
configFile: records.config
value: INT 0
- - name: CONFIG proxy.config.cache.http.compatibility.4-2-0-fixup
- configFile: records.config
- value: INT 0
- name: CONFIG proxy.config.cache.ram_cache_cutoff
configFile: records.config
value: "INT {{ (dl_atsec_ram_cache_max_obj_size_mb | float *
1000000) | int }}"
@@ -711,9 +708,6 @@ dl_ds_default_profile_layers:
- name: CONFIG proxy.config.hostdb.serve_stale_for
configFile: records.config
value: INT 20
- - name: CONFIG proxy.config.http.origin_max_connections
- configFile: records.config
- value: INT 500
- name: CONFIG proxy.config.http.parent_proxy.connect_attempts_timeout
configFile: records.config
value: INT 2
@@ -805,6 +799,14 @@ dl_ds_default_profile_layers:
- name: remap_stats.so
configFile: plugin.config
value: ''
+ # ATS 7,8 specific param
+ - name: CONFIG proxy.config.http.origin_max_connections
+ configFile: records.config
+ value: INT 500
+ # ATS 7,8 specific param
+ - name: CONFIG proxy.config.cache.http.compatibility.4-2-0-fixup
+ configFile: records.config
+ value: INT 0
v8:
- name: remap_stats.so -p
configFile: plugin.config
@@ -813,6 +815,19 @@ dl_ds_default_profile_layers:
- name: CONFIG proxy.config.ssl.server.multicert.exit_on_load_fail
configFile: records.config
value: INT 0
+ # ATS 7,8 specific param
+ - name: CONFIG proxy.config.http.origin_max_connections
+ configFile: records.config
+ value: INT 500
+ # ATS 7,8 specific param
+ - name: CONFIG proxy.config.cache.http.compatibility.4-2-0-fixup
+ configFile: records.config
+ value: INT 0
+ v9:
+ # Param change for ATS 9, from proxy.config.http.origin_max_connections
+ - name: CONFIG proxy.config.http.per_server.connection.max
+ configFile: records.config
+ value: INT 500
mid:
common:
- name: location
@@ -836,9 +851,6 @@ dl_ds_default_profile_layers:
- name: CONFIG proxy.config.hostdb.ttl_mode
configFile: records.config
value: INT 2
- - name: CONFIG proxy.config.http.origin_max_connections
- configFile: records.config
- value: INT 1500
- name: CONFIG proxy.config.http.parent_proxy.connect_attempts_timeout
configFile: records.config
value: INT 1
@@ -858,7 +870,20 @@ dl_ds_default_profile_layers:
- name: CONFIG proxy.config.cop.active_health_checks
configFile: records.config
value: INT 0
- v8: []
+ # ATS 7,8 specific param
+ - name: CONFIG proxy.config.http.origin_max_connections
+ configFile: records.config
+ value: INT 1500
+ v8:
+ # ATS 7,8 specific param
+ - name: CONFIG proxy.config.http.origin_max_connections
+ configFile: records.config
+ value: INT 1500
+ v9:
+ # Param change for ATS 9, from proxy.config.http.origin_max_connections
+ - name: CONFIG proxy.config.http.per_server.connection.max
+ configFile: records.config
+ value: INT 1500
common:
common:
- name: location
@@ -1056,15 +1081,9 @@ dl_ds_default_profile_layers:
- name: CONFIG proxy.config.http.negative_caching_list
configFile: records.config
value: STRING 204 305 403 404 405 414 500 501 502 503 504
- - name: CONFIG proxy.config.http.origin_max_connections_queue
- configFile: records.config
- value: INT 0
- name: CONFIG proxy.config.http.parent_proxy.retry_time
configFile: records.config
value: INT 10
- - name: CONFIG proxy.config.http.parent_proxy_routing_enable
- configFile: records.config
- value: INT 1
- name: CONFIG proxy.config.http.referer_default_redirect
configFile: records.config
value: STRING http://www.kabletown.invalid/
@@ -1092,9 +1111,6 @@ dl_ds_default_profile_layers:
- name: CONFIG proxy.config.net.default_inactivity_timeout
configFile: records.config
value: INT 180
- - name: CONFIG proxy.config.net.max_connections_active_in
- configFile: records.config
- value: INT 100000
- name: CONFIG proxy.config.net.max_connections_in
configFile: records.config
value: INT 100000
@@ -1216,6 +1232,18 @@ dl_ds_default_profile_layers:
- name: CONFIG proxy.config.http.normalize_ae_gzip
configFile: records.config
value: INT 0
+ # ATS 7,8 specific param
+ - name: CONFIG proxy.config.net.max_connections_active_in
+ configFile: records.config
+ value: INT 100000
+ # ATS 7,8 specific param
+ - name: CONFIG proxy.config.http.origin_max_connections_queue
+ configFile: records.config
+ value: INT 0
+ # ATS 7,8 specific param
+ - name: CONFIG proxy.config.http.parent_proxy_routing_enable
+ configFile: records.config
+ value: INT 1
v8:
- name: LogFormat.Format
configFile: logging.yaml
@@ -1297,6 +1325,27 @@ dl_ds_default_profile_layers:
- name: LOCAL proxy.local.cluster.type
configFile: records.config
value: INT 3
+ # ATS 7,8 specific param
+ - name: CONFIG proxy.config.net.max_connections_active_in
+ configFile: records.config
+ value: INT 100000
+ # ATS 7,8 specific param
+ - name: CONFIG proxy.config.http.origin_max_connections_queue
+ configFile: records.config
+ value: INT 0
+ # ATS 7,8 specific param
+ - name: CONFIG proxy.config.http.parent_proxy_routing_enable
+ configFile: records.config
+ value: INT 1
+ v9:
+ # Param change for ATS 9, from
proxy.config.net.max_connections_active_in
+ - name: CONFIG proxy.config.net.max_requests_in
+ configFile: records.config
+ value: INT 100000
+ # Param change for ATS 9, from
proxy.config.http.origin_max_connections_queue
+ - name: CONFIG proxy.config.http.per_server.connection.queue_size
+ configFile: records.config
+ value: INT 0
# TO Profiles (templates) and associated parameters
# These should be the profiles which vary by CDN association
@@ -1674,6 +1723,12 @@ dl_ds_default_profile_cdntemplates:
type: ATS_PROFILE
routingDisabled: false
parameters: "{{ dl_ds_default_profile_layers.ats.common.common +
dl_ds_default_profile_layers.ats.common['v'+dl_ds_ats_major_version] +
dl_ds_default_profile_layers.ats.edge.common +
dl_ds_default_profile_layers.ats.edge['v'+dl_ds_ats_major_version] }}"
+ - name: "EDGE_ATS_9_{{ Target_cdn_delegation }}"
+ description: "Edge cache({{ Target_cdn_delegation }}) - ATS 9"
+ cdn: "{{ Target_cdn_delegation }}"
+ type: ATS_PROFILE
+ routingDisabled: false
+ parameters: "{{ dl_ds_default_profile_layers.ats.common.common +
dl_ds_default_profile_layers.ats.common['v'+dl_ds_ats_major_version] +
dl_ds_default_profile_layers.ats.edge.common +
dl_ds_default_profile_layers.ats.edge['v'+dl_ds_ats_major_version] }}"
- name: "MID_ATS_7_{{ Target_cdn_delegation }}"
description: "Mid cache({{ Target_cdn_delegation }}) - ATS 7"
cdn: "{{ Target_cdn_delegation }}"
@@ -1686,6 +1741,12 @@ dl_ds_default_profile_cdntemplates:
type: ATS_PROFILE
routingDisabled: false
parameters: "{{ dl_ds_default_profile_layers.ats.common.common +
dl_ds_default_profile_layers.ats.common['v'+dl_ds_ats_major_version] +
dl_ds_default_profile_layers.ats.mid.common +
dl_ds_default_profile_layers.ats.mid['v'+dl_ds_ats_major_version] }}"
+ - name: "MID_ATS_9_{{ Target_cdn_delegation }}"
+ description: "Mid cache({{ Target_cdn_delegation }}) - ATS 9"
+ cdn: "{{ Target_cdn_delegation }}"
+ type: ATS_PROFILE
+ routingDisabled: false
+ parameters: "{{ dl_ds_default_profile_layers.ats.common.common +
dl_ds_default_profile_layers.ats.common['v'+dl_ds_ats_major_version] +
dl_ds_default_profile_layers.ats.mid.common +
dl_ds_default_profile_layers.ats.mid['v'+dl_ds_ats_major_version] }}"
- name: "DS_{{ target_xmlId }}_consistenthash"
description: "MSO {{ target_xmlId }} - consistent hash"
cdn: "{{ Target_cdn_delegation }}"
