From e7d48dfe02ad78ab2070ba74b741f09b9f4a9180 Mon Sep 17 00:00:00 2001 From: apaudy028 Date: Fri, 30 Jul 2021 09:28:42 -0600 Subject: [PATCH 1/2] t3c updates in ansible playbooks --- infrastructure/ansible/roles/ats/defaults/main.yml | 4 ++-- infrastructure/ansible/roles/ats/tasks/ats.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/infrastructure/ansible/roles/ats/defaults/main.yml b/infrastructure/ansible/roles/ats/defaults/main.yml index c4e3d8ac9d..02bb49a27d 100644 --- a/infrastructure/ansible/roles/ats/defaults/main.yml +++ b/infrastructure/ansible/roles/ats/defaults/main.yml @@ -40,7 +40,7 @@ ort_crontab: user: root job: >- {%- if ort_version is not defined or ort_version == omit or ort_version >= '6.0.0.11351' -%} - t3c apply --run-mode=syncds --cache-host-name='{{ (ansible_nodename.split('.')) | first }}' --log-location-warning=stderr --log-location-error=stderr --traffic-ops-url='{{ ort_traffic_ops_url }}' --traffic-ops-user='{{ ort_traffic_ops_username }}' --traffic-ops-password='{{ ort_traffic_ops_password }}' --login-dispersion=35 --dispersion=420 &> /tmp/trafficcontrol-cache-config/syncds.log + t3c apply --run-mode=syncds --cache-host-name='{{ (ansible_nodename.split('.')) | first }}' -vv --traffic-ops-url='{{ ort_traffic_ops_url }}' --traffic-ops-user='{{ ort_traffic_ops_username }}' --traffic-ops-password='{{ ort_traffic_ops_password }}' --login-dispersion=35 --dispersion=420 &> /tmp/trafficcontrol-cache-config/syncds.log {%- else -%} traffic_ops_ort.pl syncds warn {{ ort_traffic_ops_url }} '{{ ort_traffic_ops_username }}:{{ ort_traffic_ops_password }}' --login_dispersion=35 --dispersion=420 &>/tmp/ort/syncds.log {%- endif -%} @@ -50,7 +50,7 @@ ort_crontab: user: root job: >- {%- if ort_version is not defined or ort_version == omit or ort_version >= '6.0.0.11351' -%} - t3c apply --run-mode=revalidate --cache-host-name='{{ (ansible_nodename.split('.')) | first }}' --log-location-warning=stderr --log-location-error=stderr --traffic-ops-url='{{ ort_traffic_ops_url }}' --traffic-ops-user='{{ ort_traffic_ops_username }}' --traffic-ops-password='{{ ort_traffic_ops_password }}' --login-dispersion=35 &> /tmp/trafficcontrol-cache-config/reval.log + t3c apply --run-mode=revalidate --cache-host-name='{{ (ansible_nodename.split('.')) | first }}' -vv --traffic-ops-url='{{ ort_traffic_ops_url }}' --traffic-ops-user='{{ ort_traffic_ops_username }}' --traffic-ops-password='{{ ort_traffic_ops_password }}' --login-dispersion=35 &> /tmp/trafficcontrol-cache-config/reval.log {%- else -%} traffic_ops_ort.pl revalidate warn {{ ort_traffic_ops_url }} '{{ ort_traffic_ops_username }}:{{ ort_traffic_ops_password }}' --login_dispersion=35 &>/tmp/ort/reval.log {%- endif -%} diff --git a/infrastructure/ansible/roles/ats/tasks/ats.yml b/infrastructure/ansible/roles/ats/tasks/ats.yml index 539b52b118..7e608607e6 100644 --- a/infrastructure/ansible/roles/ats/tasks/ats.yml +++ b/infrastructure/ansible/roles/ats/tasks/ats.yml @@ -67,7 +67,7 @@ executable: "{{ lookup('pipe','command -v bash') }}" cmd: >- {%- if ort_version is not defined or ort_version == omit or ort_version >= '6.0.0.11351' -%} - pkill -9 t3c || true; t3c apply --run-mode=badass --cache-host-name='{{ (ansible_nodename.split('.')) | first }}' --log-location-warning=stderr --log-location-error=stderr --traffic-ops-url='{{ ort_traffic_ops_url }}' --traffic-ops-user='{{ ort_traffic_ops_username }}' --traffic-ops-password='{{ ort_traffic_ops_password }}' --login-dispersion=0 --dispersion=0 --wait-for-parents=false 2>&1 | tee /tmp/trafficcontrol-cache-config/badass_out; exit ${PIPESTATUS[0]} + pkill -9 t3c || true; t3c apply --run-mode=badass --cache-host-name='{{ (ansible_nodename.split('.')) | first }}' -vv --traffic-ops-url='{{ ort_traffic_ops_url }}' --traffic-ops-user='{{ ort_traffic_ops_username }}' --traffic-ops-password='{{ ort_traffic_ops_password }}' --login-dispersion=0 --dispersion=0 --wait-for-parents=false 2>&1 | tee /tmp/trafficcontrol-cache-config/badass_out; exit ${PIPESTATUS[0]} {%- else -%} pkill -9 _ort || true; traffic_ops_ort.pl -dispersion=0 --wait_for_parents=0 --login_dispersion=0 --retries=1 badass warn {{ ort_traffic_ops_url }} '{{ ort_traffic_ops_username }}:{{ ort_traffic_ops_password }}' 2>&1 | tee /tmp/badass_out; exit ${PIPESTATUS[0]} {%- endif -%} From 4fe8dc716998fe543b7039bc6df9b772c3a9f132 Mon Sep 17 00:00:00 2001 From: apaudy028 Date: Fri, 30 Jul 2021 09:32:54 -0600 Subject: [PATCH 2/2] changelog updated --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 358c6f2ffa..136564d756 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -58,6 +58,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - Added a tool at `/traffic_ops/app/db/reencrypt` to re-encrypt the data in the Postgres Traffic Vault with a new key. - Enhanced ort integration test for reload states - Added a new field to Delivery Services - `tlsVersions` - that explicitly lists the TLS versions that may be used to retrieve their content from Cache Servers. +- Updated T3C changes in Ansible playbooks ### Fixed - [#5690](https://github.com/apache/trafficcontrol/issues/5690) - Fixed github action for added/modified db migration file.