You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by rs...@apache.org on 2023/10/23 23:31:11 UTC
[trafficcontrol] branch 8.0.x updated (6d0d2ae498 -> 23e9248c5e)
This is an automated email from the ASF dual-hosted git repository.
rshah pushed a change to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
from 6d0d2ae498 admin tool no seed on upgrade (#7614)
new 5af518f74f Seed database in CDN in a Box for developers (#7827)
new 57af39d4aa Re-add removed parenthesis (#7828)
new 58641515c7 t3c removed perl dependency (#7832)
new 23e9248c5e t3c remove perl dependency and references (#7829)
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/tr-ultimate-test-harness.yml | 2 +
CHANGELOG.md | 2 +
cache-config/build/build_rpm.sh | 2 -
.../build/trafficcontrol-cache-config.spec | 7 +-
cache-config/supermicro_udev_mapper.pl | 81 -----------
cache-config/t3c-apply/README.md | 2 +-
cache-config/traffic_ops_ort.pl | 153 ---------------------
dev/traffic_ops/run.sh | 16 ++-
infrastructure/ansible/roles/ats/defaults/main.yml | 14 +-
infrastructure/ansible/roles/ats/tasks/ats.yml | 24 +---
.../ansible/roles/dataset_loader/defaults/main.yml | 6 -
infrastructure/ansible/roles/grove/tasks/grove.yml | 7 -
12 files changed, 18 insertions(+), 298 deletions(-)
delete mode 100755 cache-config/supermicro_udev_mapper.pl
delete mode 100755 cache-config/traffic_ops_ort.pl
[trafficcontrol] 03/04: t3c removed perl dependency (#7832)
Posted by rs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rshah pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit 58641515c79c906a1519f3835a6e36ba5d76b380
Author: Joe Pappano <jo...@cable.comcast.com>
AuthorDate: Fri Oct 6 17:18:44 2023 -0400
t3c removed perl dependency (#7832)
* removed perl dependency
* added changelog entry
* updated changelog entry
(cherry picked from commit ed9795f0c12963c2fe2a3b8663bebeaab40db8cf)
---
CHANGELOG.md | 1 +
cache-config/build/trafficcontrol-cache-config.spec | 2 +-
cache-config/t3c-apply/README.md | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1b1840319..6aa9cb0790 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
### Changed
- [#7614](https://github.com/apache/trafficcontrol/pull/7614) *Traffic Ops* The database upgrade process no longer overwrites changes users may have made to the initially seeded data.
+- [#7832](https://github.com/apache/trafficcontrol/pull/7832) *t3c* Removed perl dependency
## [8.0.0] - 2023-09-20
### Added
diff --git a/cache-config/build/trafficcontrol-cache-config.spec b/cache-config/build/trafficcontrol-cache-config.spec
index 607758743b..456b3af9dd 100644
--- a/cache-config/build/trafficcontrol-cache-config.spec
+++ b/cache-config/build/trafficcontrol-cache-config.spec
@@ -26,7 +26,7 @@ Source0: trafficcontrol-cache-config-%{version}.tgz
URL: https://github.com/apache/trafficcontrol/
Vendor: Apache Software Foundation
Packager: dev at trafficcontrol dot Apache dot org
-Requires: git, perl
+Requires: git
%description
Installs Traffic Control Cache Configuration utilities. See the `t3c` application.
diff --git a/cache-config/t3c-apply/README.md b/cache-config/t3c-apply/README.md
index 65ec94fc3d..808f114ca1 100644
--- a/cache-config/t3c-apply/README.md
+++ b/cache-config/t3c-apply/README.md
@@ -46,7 +46,7 @@ t3c-apply [-2AbceFhIknopsSvW] [-a service-action] [-f \<all|reval|none\>] [-g \<
# DESCRIPTION
-The t3c-apply command is a transliteration of traffic_ops_ort.pl script to the go language. It is designed to replace the traffic_ops_ort.pl perl script and it is used to apply configuration from Traffic Control, stored in Traffic Ops, to the cache.
+The t3c-apply command is used to apply configuration from Traffic Control, stored in Traffic Ops, to the cache.
Typical usage is to install t3c on the cache machine, and then run it periodically via a CRON job.
[trafficcontrol] 02/04: Re-add removed parenthesis (#7828)
Posted by rs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rshah pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit 57af39d4aa71aeaa1d997df516c38516619a4bec
Author: Zach Hoffman <zr...@apache.org>
AuthorDate: Wed Oct 4 09:00:32 2023 -0600
Re-add removed parenthesis (#7828)
(cherry picked from commit f96f030c632e091fbe95051fb8bf60dd5540019e)
---
.github/workflows/tr-ultimate-test-harness.yml | 2 ++
dev/traffic_ops/run.sh | 15 +++++++++------
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/tr-ultimate-test-harness.yml b/.github/workflows/tr-ultimate-test-harness.yml
index 3a106a17b7..5dbb842193 100644
--- a/.github/workflows/tr-ultimate-test-harness.yml
+++ b/.github/workflows/tr-ultimate-test-harness.yml
@@ -26,6 +26,7 @@ on:
paths:
- .github/actions/tr-ultimate-test-harness/**
- .github/workflows/tr-ultimate-test-harness.yml
+ - dev/traffic_ops/**
- dev/traffic_router/**
- traffic_router/**
create:
@@ -33,6 +34,7 @@ on:
paths:
- .github/actions/tr-ultimate-test-harness/**
- .github/workflows/tr-ultimate-test-harness.yml
+ - dev/traffic_ops/**
- dev/traffic_router/**
- traffic_router/**
types: [ opened, reopened, ready_for_review, synchronize ]
diff --git a/dev/traffic_ops/run.sh b/dev/traffic_ops/run.sh
index 152d98b3e1..dea6a4f7f0 100755
--- a/dev/traffic_ops/run.sh
+++ b/dev/traffic_ops/run.sh
@@ -28,13 +28,16 @@ db_init() {
cd "$TC"
make traffic_ops/app/db/admin
- (cd "$TC/dev/traffic_ops"
+ (
+ cd "$TC/dev/traffic_ops"
+ "$ADMIN" -c ./dbconf.yml -s "$TC/traffic_ops/app/db/create_tables.sql" -S "$TC/traffic_ops/app/db/seeds.sql" -p "$TC/traffic_ops/app/db/patches.sql" -m "$TC/traffic_ops/app/db/migrations" reset
+ "$ADMIN" -c ./dbconf.yml -s "$TC/traffic_ops/app/db/create_tables.sql" -S "$TC/traffic_ops/app/db/seeds.sql" -p "$TC/traffic_ops/app/db/patches.sql" -m "$TC/traffic_ops/app/db/migrations" upgrade
+ "$ADMIN" -c ./dbconf.yml -s "$TC/traffic_ops/app/db/create_tables.sql" -S "$TC/traffic_ops/app/db/seeds.sql" -p "$TC/traffic_ops/app/db/patches.sql" -m "$TC/traffic_ops/app/db/migrations" seed
+ "$ADMIN" -v -c ./traffic.vault.dbconf.yml -s "$TC/traffic_ops/app/db/trafficvault/create_tables.sql" -m "$TC/traffic_ops/app/db/trafficvault/migrations" reset
+ "$ADMIN" -v -c ./traffic.vault.dbconf.yml -s "$TC/traffic_ops/app/db/trafficvault/create_tables.sql" -m "$TC/traffic_ops/app/db/trafficvault/migrations" upgrade
- "$ADMIN" -c ./dbconf.yml -s "$TC/traffic_ops/app/db/create_tables.sql" -S "$TC/traffic_ops/app/db/seeds.sql" -p "$TC/traffic_ops/app/db/patches.sql" -m "$TC/traffic_ops/app/db/migrations" reset
- "$ADMIN" -c ./dbconf.yml -s "$TC/traffic_ops/app/db/create_tables.sql" -S "$TC/traffic_ops/app/db/seeds.sql" -p "$TC/traffic_ops/app/db/patches.sql" -m "$TC/traffic_ops/app/db/migrations" upgrade
- "$ADMIN" -c ./dbconf.yml -s "$TC/traffic_ops/app/db/create_tables.sql" -S "$TC/traffic_ops/app/db/seeds.sql" -p "$TC/traffic_ops/app/db/patches.sql" -m "$TC/traffic_ops/app/db/migrations" seed
- "$ADMIN" -v -c ./traffic.vault.dbconf.yml -s "$TC/traffic_ops/app/db/trafficvault/create_tables.sql" -m "$TC/traffic_ops/app/db/trafficvault/migrations" reset
- "$ADMIN" -v -c ./traffic.vault.dbconf.yml -s "$TC/traffic_ops/app/db/trafficvault/create_tables.sql" -m "$TC/traffic_ops/app/db/trafficvault/migrations" upgrade
+ psql -d 'postgres://traffic_ops:twelve12@db:5432/traffic_ops_development?sslmode=disable' -f ./seed.psql
+ )
}
user=trafficops
[trafficcontrol] 01/04: Seed database in CDN in a Box for developers (#7827)
Posted by rs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rshah pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit 5af518f74fd34044021929031a86fc7c766ccee7
Author: Zach Hoffman <zr...@apache.org>
AuthorDate: Tue Oct 3 13:58:43 2023 -0600
Seed database in CDN in a Box for developers (#7827)
* Seed database in CDN in a Box for developers
* Remove psql command that does nothing, since seed.psql does not exist
(cherry picked from commit 1954ac220275e5933b69e1155433f57843af9ae6)
---
dev/traffic_ops/run.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/dev/traffic_ops/run.sh b/dev/traffic_ops/run.sh
index f0feb39d1b..152d98b3e1 100755
--- a/dev/traffic_ops/run.sh
+++ b/dev/traffic_ops/run.sh
@@ -32,10 +32,9 @@ db_init() {
"$ADMIN" -c ./dbconf.yml -s "$TC/traffic_ops/app/db/create_tables.sql" -S "$TC/traffic_ops/app/db/seeds.sql" -p "$TC/traffic_ops/app/db/patches.sql" -m "$TC/traffic_ops/app/db/migrations" reset
"$ADMIN" -c ./dbconf.yml -s "$TC/traffic_ops/app/db/create_tables.sql" -S "$TC/traffic_ops/app/db/seeds.sql" -p "$TC/traffic_ops/app/db/patches.sql" -m "$TC/traffic_ops/app/db/migrations" upgrade
+ "$ADMIN" -c ./dbconf.yml -s "$TC/traffic_ops/app/db/create_tables.sql" -S "$TC/traffic_ops/app/db/seeds.sql" -p "$TC/traffic_ops/app/db/patches.sql" -m "$TC/traffic_ops/app/db/migrations" seed
"$ADMIN" -v -c ./traffic.vault.dbconf.yml -s "$TC/traffic_ops/app/db/trafficvault/create_tables.sql" -m "$TC/traffic_ops/app/db/trafficvault/migrations" reset
"$ADMIN" -v -c ./traffic.vault.dbconf.yml -s "$TC/traffic_ops/app/db/trafficvault/create_tables.sql" -m "$TC/traffic_ops/app/db/trafficvault/migrations" upgrade
-
- psql -d 'postgres://traffic_ops:twelve12@db:5432/traffic_ops_development?sslmode=disable' -f ./seed.psql)
}
user=trafficops
[trafficcontrol] 04/04: t3c remove perl dependency and references (#7829)
Posted by rs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rshah pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit 23e9248c5ee0fb156b57d60344631ab3216a5811
Author: Joe Pappano <jo...@cable.comcast.com>
AuthorDate: Thu Oct 19 15:20:09 2023 -0400
t3c remove perl dependency and references (#7829)
* removed perl scripts no longer needed
* removed references to traffic_ops_ort and supermicro_udev_rules
* removed perl dependency
* updated CHANGELOG.md
* removed if clauses
(cherry picked from commit 51345aad56f816ba35be5c090561e5bc524d8aec)
---
CHANGELOG.md | 1 +
cache-config/build/build_rpm.sh | 2 -
.../build/trafficcontrol-cache-config.spec | 5 -
cache-config/supermicro_udev_mapper.pl | 81 -----------
cache-config/traffic_ops_ort.pl | 153 ---------------------
infrastructure/ansible/roles/ats/defaults/main.yml | 14 +-
infrastructure/ansible/roles/ats/tasks/ats.yml | 24 +---
.../ansible/roles/dataset_loader/defaults/main.yml | 6 -
infrastructure/ansible/roles/grove/tasks/grove.yml | 7 -
9 files changed, 4 insertions(+), 289 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6aa9cb0790..17a9b1f9f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -199,6 +199,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
- [#7271](https://github.com/apache/trafficcontrol/pull/7271) Removed `misc/jira_github_issue_import.py`, the project does not use JIRA.
- [#7271](https://github.com/apache/trafficcontrol/pull/7271) Removed `traffic_ops/install/bin/convert_profile/`, this script is outdated and is for use on an EOL ATS version.
- [#7271](https://github.com/apache/trafficcontrol/pull/7271) Removed `traffic_ops/install/bin/install_go.sh`, `traffic_ops/install/bin/todb_bootstrap.sh` and `traffic_ops/install/bin/install_goose.sh` are no longer in use.
+- [#7829](https://github.com/apache/trafficcontrol/pull/7829) Removed `cache-config/supermicro_udev_mapper.pl` and `traffic_ops_ort.pl` and any references
## [7.0.0] - 2022-07-19
### Added
diff --git a/cache-config/build/build_rpm.sh b/cache-config/build/build_rpm.sh
index 5aa82fb9a9..9db0ebf203 100755
--- a/cache-config/build/build_rpm.sh
+++ b/cache-config/build/build_rpm.sh
@@ -127,8 +127,6 @@ initBuildArea() {
buildManpage 't3c-preprocess';
)
- cp -p traffic_ops_ort.pl "$dest";
- cp -p supermicro_udev_mapper.pl "$dest";
mkdir -p "${dest}/build";
echo "build_rpm.sh lsing for logrotate";
diff --git a/cache-config/build/trafficcontrol-cache-config.spec b/cache-config/build/trafficcontrol-cache-config.spec
index 456b3af9dd..e3176c402e 100644
--- a/cache-config/build/trafficcontrol-cache-config.spec
+++ b/cache-config/build/trafficcontrol-cache-config.spec
@@ -143,9 +143,6 @@ mkdir -p "${RPM_BUILD_ROOT}"/var/log/trafficcontrol-cache-config
mkdir -p ${RPM_BUILD_ROOT}/"$mandir"/"$man1dir"
mkdir -p ${RPM_BUILD_ROOT}/usr/lib/systemd/system
-cp -p ${RPM_SOURCE_DIR}/trafficcontrol-cache-config-%{version}/traffic_ops_ort.pl ${RPM_BUILD_ROOT}/"$installdir"
-cp -p ${RPM_SOURCE_DIR}/trafficcontrol-cache-config-%{version}/supermicro_udev_mapper.pl ${RPM_BUILD_ROOT}/"$installdir"
-
src=src/github.com/apache/trafficcontrol/cache-config
cp -p ${RPM_SOURCE_DIR}/trafficcontrol-cache-config-%{version}/build/atstccfg.logrotate "${RPM_BUILD_ROOT}"/etc/logrotate.d/atstccfg
touch ${RPM_BUILD_ROOT}/var/log/trafficcontrol-cache-config/atstccfg.log
@@ -225,8 +222,6 @@ fi
%files
%license LICENSE
%attr(755, root, root)
-/usr/bin/traffic_ops_ort.pl
-/usr/bin/supermicro_udev_mapper.pl
/usr/bin/t3c
/usr/bin/t3c-apply
/usr/bin/t3c-check
diff --git a/cache-config/supermicro_udev_mapper.pl b/cache-config/supermicro_udev_mapper.pl
deleted file mode 100755
index efaecb51d7..0000000000
--- a/cache-config/supermicro_udev_mapper.pl
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/perl
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-use strict;
-use warnings;
-
-$| = 1;
-
-my $udevadm = "/sbin/udevadm";
-my $kernel_device = shift(@ARGV);
-
-if (!defined($kernel_device)) {
- die("Please specify a device");
-}
-
-if (! -x $udevadm) {
- die("$udevadm: $!");
-}
-
-# udevadm info --export-db |grep block |grep expander |egrep '^P'
-# ...
-# P: /devices/pci0000:80/0000:80:01.0/0000:81:00.0/host2/port-2:0/expander-2:0/port-2:0:7/end_device-2:0:7/target2:0:7/2:0:7:0/block/sdbd
-# P: /devices/pci0000:80/0000:80:01.0/0000:81:00.0/host2/port-2:0/expander-2:0/port-2:0:8/end_device-2:0:8/target2:0:8/2:0:8:0/block/sdbe
-# P: /devices/pci0000:80/0000:80:01.0/0000:81:00.0/host2/port-2:0/expander-2:0/port-2:0:9/end_device-2:0:9/target2:0:9/2:0:9:0/block/sdbf
-# ...
-
-my @out = `/sbin/udevadm info --export-db`;
-my $devices = {};
-
-for my $line (@out) {
- chomp($line);
- next unless ($line =~ /^P: .*$/ && $line =~ /block/ && $line =~ /expander/);
-
- my (undef, $device) = split(/^P: /, $line, 2);
- my @path_parts = split(/\//, $device);
- my $disk = pop(@path_parts);
- pop(@path_parts);
- my $path_ids = pop(@path_parts);
- my @target_parts = split(/:/, $path_ids);
-
- $devices->{$target_parts[0]}->{$target_parts[1]}->{$target_parts[2]}->{$target_parts[3]} = $disk;
-}
-
-my $matched = 0;
-my $oa = 0;
-
-for my $da (sort { $a <=> $b } (keys(%{$devices}))) {
- my $ob = 0;
- for my $db (sort { $a <=> $b } (keys(%{$devices->{$da}}))) {
- for my $dc (sort { $a <=> $b } (keys(%{$devices->{$da}->{$db}}))) {
- for my $dd (sort { $a <=> $b } (keys(%{$devices->{$da}->{$db}->{$dc}}))) {
- if ($kernel_device eq $devices->{$da}->{$db}->{$dc}->{$dd}) {
- printf("%d-%d-%02d\n", $oa, $ob, $dc);
- $matched = 1;
- last;
- }
- }
-
- last if ($matched);
- }
-
- last if ($matched);
- $ob++;
- }
-
- last if ($matched);
- $oa++;
-}
diff --git a/cache-config/traffic_ops_ort.pl b/cache-config/traffic_ops_ort.pl
deleted file mode 100755
index 2c35f6a42e..0000000000
--- a/cache-config/traffic_ops_ort.pl
+++ /dev/null
@@ -1,153 +0,0 @@
-#!/usr/bin/perl
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-use strict;
-use warnings;
-use Getopt::Long;
-
-my $dispersion = undef;
-my $retries = 5;
-my $wait_for_parents = 1;
-my $login_dispersion = 0;
-my $reval_wait_time = 60;
-my $reval_in_use = 0;
-my $rev_proxy_disable = 0;
-my $skip_os_check = 0;
-my $override_hostname_short = '';
-my $to_timeout_ms = 30000;
-my $syncds_updates_ipallow = 0;
-my $traffic_ops_insecure = 0;
-my $via_string_release = 0;
-my $dns_local_bind = 0;
-my $disable_parent_config_comments = 0;
-
-print "ERROR traffic_ops_ort.pl is deprecated and will be removed in the next major version! Please upgrade to t3c\n";
-
-GetOptions( "dispersion=i" => \$dispersion, # dispersion (in seconds)
- "retries=i" => \$retries,
- "wait_for_parents=i" => \$wait_for_parents,
- "login_dispersion=i" => \$login_dispersion,
- "rev_proxy_disable=i" => \$rev_proxy_disable,
- "skip_os_check=i" => \$skip_os_check,
- "override_hostname_short=s" => \$override_hostname_short,
- "to_timeout_ms=i" => \$to_timeout_ms,
- "syncds_updates_ipallow=i" => \$syncds_updates_ipallow,
- "traffic_ops_insecure=i" => \$traffic_ops_insecure,
- "via_string_release=i" => \$via_string_release,
- "dns_local_bind=i" => \$dns_local_bind,
- "disable_parent_config_comments=i" => \$disable_parent_config_comments,
- );
-
-my $cmd = 't3c apply -vv';
-
-if ( defined $dispersion ) {
- my $sleeptime = rand($dispersion);
- print "ERROR t3c no longer has a dispersion feature, Please upgrade to t3c, and use shell commands to randomly sleep if necessary. Sleeping for rand($dispersion)=$sleeptime\n";
- sleep($sleeptime);
-}
-if ( defined $retries ) {
- $cmd .= ' --num-retries=' . $retries;
-}
-if ( defined $wait_for_parents && $wait_for_parents == 0 ) {
- $cmd .= ' --wait-for-parents=false';
-}
-if ( defined $login_dispersion ) {
- my $sleeptime = rand($login_dispersion);
- print "ERROR t3c no longer has any dispersion feature, Please upgrade to t3c, and use shell commands to randomly sleep if necessary. Sleeping for rand($login_dispersion)=$sleeptime\n";
- sleep($sleeptime);
-}
-if ( defined $rev_proxy_disable && $rev_proxy_disable == 1 ) {
- $cmd .= ' --rev-proxy-disable=true';
-}
-if ( defined $skip_os_check ) {
- $cmd .= ' --skip-os-check=' . $skip_os_check;
-}
-if ( defined $override_hostname_short ) {
- $cmd .= ' --cache-host-name=' . $override_hostname_short;
-} else {
- $cmd .= ' --cache-host-name=' . `hostname -s`;
-}
-if ( defined $to_timeout_ms ) {
- $cmd .= ' --traffic-ops-timeout-milliseconds=' . $to_timeout_ms;
-}
-if ( $syncds_updates_ipallow == 1 ) {
- $cmd .= ' --syncds-updates-ipallow=true';
-}
-if ( defined $traffic_ops_insecure ) {
- $cmd .= ' --traffic-ops-insecure=' . $traffic_ops_insecure;
-}
-if ( $via_string_release != 1 ) {
- $cmd .= ' --omit-via-string-release=true';
-}
-if ( $dns_local_bind == 1 ) {
- $cmd .= ' --dns-local-bind=true';
-}
-if ( $disable_parent_config_comments == 1 ) {
- $cmd .= ' --disable-parent-config-comments=true';
-}
-
-my $mode = $ARGV[0];
-if ( defined $mode ) {
- $cmd .= ' --run-mode=' . $mode;
-}
-if ( defined( $ARGV[2] ) ) {
- my $to_url = $ARGV[2];
- $to_url =~ s/\/*$//g;
- $cmd .= ' --traffic-ops-url=' . $to_url;
-}
-if ( defined( $ARGV[3] ) ) {
- my ( $to_user, $to_pass ) = split( /:/, $ARGV[3] );
- $cmd .= ' --traffic-ops-user=' . $to_user;
- $cmd .= ' --traffic-ops-password=' . $to_pass;
-}
-else {
- &usage();
- exit 1;
-}
-
-sub usage {
- print "====-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-====\n";
- print "Usage: ./traffic_ops_ort.pl <Mode> <Log_Level> <Traffic_Ops_URL> <Traffic_Ops_Login> [optional flags]\n";
- print "Usage: ./traffic_ops_ort.pl <Mode> <Log_Level> <Traffic_Ops_URL> <Traffic_Ops_Login> [optional flags]\n";
- print "\t<Mode> = interactive - asks questions during config process.\n";
- print "\t<Mode> = report - prints config differences and exits.\n";
- print "\t<Mode> = badass - attempts to fix all config differences that it can.\n";
- print "\t<Mode> = syncds - syncs delivery services with what is configured in Traffic Ops.\n";
- print "\t<Mode> = revalidate - checks for updated revalidations in Traffic Ops and applies them. Requires Traffic Ops 2.1.\n";
- print "\n";
- print "\t<Log_Level> => ALL, TRACE, DEBUG, INFO, WARN, ERROR, FATAL, NONE\n";
- print "\n";
- print "\t<Traffic_Ops_URL> = URL to Traffic Ops host. Example: https://trafficops.company.net\n";
- print "\n";
- print "\t<Traffic_Ops_Login> => Example: 'username:password' \n";
- print "\n\t[optional flags]:\n";
- print "\t dispersion=<time> => wait a random number between 0 and <time> before starting. Default = 300.\n";
- print "\t login_dispersion=<time> => wait a random number between 0 and <time> before login. Default = 0.\n";
- print "\t retries=<number> => retry connection to Traffic Ops URL <number> times. Default = 3.\n";
- print "\t wait_for_parents=<0|1> => do not update if parent_pending = 1 in the update json. Default = 1, wait for parents.\n";
- print "\t rev_proxy_disable=<0|1> => bypass the reverse proxy even if one has been configured Default = 0.\n";
- print "\t skip_os_check=<0|1> => bypass the check for a supported CentOS version. Default = 0.\n";
- print "\t override_hostname_short=<text> => override the short hostname of the OS for config generation. Default = ''.\n";
- print "\t to_timeout_ms=<time> => the Traffic Ops request timeout in milliseconds. Default = 30000 (30 seconds).\n";
- print "\t syncds_updates_ipallow=<0|1> => Update ip_allow.config in syncds mode, which may trigger an ATS bug blocking random addresses on load! Default = 0, only update on badass and restart.\n";
- print "\t traffic_ops_insecure=<0|1> => Turns off certificate checking when connecting to Traffic Ops.\n";
- print "\t via_string_release=<0|1> => change the ATS via string to be the rpm release instead of the actual ATS version number\n";
- print "\t dns_local_bind=<0|1> => set the server service addresses to the ATS config dns local bind address\n";
- print "\t disable_parent_config_comments=<0|1> => do not write line comments to the parent.config file\n";
- print "====-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-====\n";
- exit 1;
-}
-
-exec ("$cmd");
diff --git a/infrastructure/ansible/roles/ats/defaults/main.yml b/infrastructure/ansible/roles/ats/defaults/main.yml
index 16c89fca44..ba38627ff0 100644
--- a/infrastructure/ansible/roles/ats/defaults/main.yml
+++ b/infrastructure/ansible/roles/ats/defaults/main.yml
@@ -38,20 +38,10 @@ ort_crontab:
syncds:
schedule: '0,20,40 * * * *'
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 }}' -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 -%}
+ job: "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"
# 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' -%}
- 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
- {%- endif -%}
+ job: "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"
ats_clear_data: false
diff --git a/infrastructure/ansible/roles/ats/tasks/ats.yml b/infrastructure/ansible/roles/ats/tasks/ats.yml
index 46e7714118..84d9e0429b 100644
--- a/infrastructure/ansible/roles/ats/tasks/ats.yml
+++ b/infrastructure/ansible/roles/ats/tasks/ats.yml
@@ -22,23 +22,6 @@
retries: 5
delay: 5
-- name: Deploy the udev device mapper script to a more reliable location
- # with /opt on separate lvm part, udev on boot may fail
- copy:
- remote_src: true
- src: >-
- {%- 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
- {%- endif -%}
- dest: /bin/supermicro_udev_mapper.pl
- remote_src: true
- owner: root
- group: root
- mode: 0755
- ignore_errors: true
-
- name: Deploy ORT/t3c Crontab
template:
src: crontab.j2
@@ -66,12 +49,7 @@
- name: Run ORT Badass
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' -%}
- 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]}
- {%- 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 -%}
+ cmd: "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]}"
no_log: True
- name: Reboot
diff --git a/infrastructure/ansible/roles/dataset_loader/defaults/main.yml b/infrastructure/ansible/roles/dataset_loader/defaults/main.yml
index 734719168c..990510a698 100644
--- a/infrastructure/ansible/roles/dataset_loader/defaults/main.yml
+++ b/infrastructure/ansible/roles/dataset_loader/defaults/main.yml
@@ -830,12 +830,6 @@ dl_ds_default_profile_layers:
value: INT 500
mid:
common:
- - name: location
- configFile: 40-ats.rules
- value: "/etc/udev/rules.d/"
- - name: udev_syncds
- configFile: 40-ats.rules
- value: 'KERNEL==\"sd*\", DRIVERS==\"mpt3sas\", PROGRAM=\"/bin/supermicro_udev_mapper.pl %k\", SYMLINK+=\"ats/%c\", OWNER=\"ats\"'
- name: weight
configFile: parent.config
value: '1.0'
diff --git a/infrastructure/ansible/roles/grove/tasks/grove.yml b/infrastructure/ansible/roles/grove/tasks/grove.yml
index a73c5bc722..a9922bc262 100644
--- a/infrastructure/ansible/roles/grove/tasks/grove.yml
+++ b/infrastructure/ansible/roles/grove/tasks/grove.yml
@@ -42,13 +42,6 @@
path: /opt/ort
state: directory
-- name: Create an empty ORT file
- copy:
- dest: "/opt/ort/traffic_ops_ort.pl"
- content: |
- #!/usr/bin/perl
- # empty for Grove, prevents systems previously running ORT from overriding TO Update Flag
-
- name: Create an empty t3c file
copy:
dest: "/usr/bin/t3c"