You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by jh...@apache.org on 2021/07/30 18:10:41 UTC
[trafficcontrol] branch master updated: t3c updates in ansible
playbooks (#6073)
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 7ec675f t3c updates in ansible playbooks (#6073)
7ec675f is described below
commit 7ec675ff9917fa3a512f06f85ffe3fad39d10eb1
Author: Ashish P <as...@cable.comcast.com>
AuthorDate: Fri Jul 30 12:10:34 2021 -0600
t3c updates in ansible playbooks (#6073)
* t3c updates in ansible playbooks
* changelog updated
---
CHANGELOG.md | 1 +
infrastructure/ansible/roles/ats/defaults/main.yml | 4 ++--
infrastructure/ansible/roles/ats/tasks/ats.yml | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 358c6f2..136564d 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.
diff --git a/infrastructure/ansible/roles/ats/defaults/main.yml b/infrastructure/ansible/roles/ats/defaults/main.yml
index c4e3d8a..02bb49a 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 539b52b..7e60860 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 -%}