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/09/13 15:48:04 UTC
[trafficcontrol] branch master updated: Endashen ort_version
comparison right-hand side (#6185)
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 586fcd6 Endashen ort_version comparison right-hand side (#6185)
586fcd6 is described below
commit 586fcd681cbb9339f77858dad7896459373812f8
Author: Zach Hoffman <zr...@apache.org>
AuthorDate: Mon Sep 13 09:47:55 2021 -0600
Endashen ort_version comparison right-hand side (#6185)
---
infrastructure/ansible/roles/ats/defaults/main.yml | 6 +++---
infrastructure/ansible/roles/ats/tasks/ats.yml | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/infrastructure/ansible/roles/ats/defaults/main.yml b/infrastructure/ansible/roles/ats/defaults/main.yml
index cab5c24..6a43450 100644
--- a/infrastructure/ansible/roles/ats/defaults/main.yml
+++ b/infrastructure/ansible/roles/ats/defaults/main.yml
@@ -16,7 +16,7 @@
install_ats: False
ort_pkg_name: >-
{%- if ort_version is defined and ort_version != omit -%}
- {%- if ort_version >= '6.0.0.11351' -%}
+ {%- if ort_version >= '6.0.0-11351' -%}
{{ 'trafficcontrol-cache-config-'+ort_version }}
{%- else -%}
{{ 'traffic_ops_ort-'+ort_version }}
@@ -39,7 +39,7 @@ 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 or ort_version >= '6.0.0-11351' -%}
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
@@ -49,7 +49,7 @@ ort_crontab:
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 or ort_version >= '6.0.0-11351' -%}
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
{%- 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
diff --git a/infrastructure/ansible/roles/ats/tasks/ats.yml b/infrastructure/ansible/roles/ats/tasks/ats.yml
index b56e955..397d6a6 100644
--- a/infrastructure/ansible/roles/ats/tasks/ats.yml
+++ b/infrastructure/ansible/roles/ats/tasks/ats.yml
@@ -27,7 +27,7 @@
copy:
remote_src: true
src: >-
- {%- 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 or ort_version >= '6.0.0-11351' -%}
/usr/bin/supermicro_udev_mapper.pl
{%- else -%}
/opt/ort/supermicro_udev_mapper.pl
@@ -66,7 +66,7 @@
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 or ort_version >= '6.0.0-11351' -%}
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 }}' --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]}