jhg03a commented on code in PR #7829:
URL: https://github.com/apache/trafficcontrol/pull/7829#discussion_r1347921540
##########
infrastructure/ansible/roles/ats/tasks/ats.yml:
##########
@@ -67,10 +50,8 @@
shell:
executable: "{{ lookup('pipe','command -v bash') }}"
cmd: >-
- {%- if ort_version is not defined or ort_version == omit or ort_version
>= '6.0.0-11351' -%}
+ {%- if ort_version is not defined or ort_version == omit -%}
pkill -9 t3c || true; t3c apply --run-mode=badass --git=yes
--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 }}' --wait-for-parents=false 2>&1 | tee
/tmp/trafficcontrol-cache-config/badass_out; exit ${PIPESTATUS[0]}
Review Comment:
The if clause can be removed
##########
infrastructure/ansible/roles/ats/defaults/main.yml:
##########
@@ -39,19 +39,15 @@ ort_crontab:
schedule: '0,20,40 * * * *'
user: root
job: >-
- {%- if ort_version is not defined or ort_version == omit or ort_version
>= '6.0.0-11351' -%}
+ {%- if ort_version is not defined or ort_version == omit -%}
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 }}' &>
/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 -%}
# Perform a check for user requested content invalidations every minute
reval:
schedule: '1-19,21-39,41-59 * * * *'
user: root
job: >-
- {%- if ort_version is not defined or ort_version == omit or ort_version
>= '6.0.0-11351' -%}
+ {%- if ort_version is not defined or ort_version == omit -%}
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 }}' &>
/tmp/trafficcontrol-cache-config/reval.log
Review Comment:
The if clauses here can be removed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
