This is an automated email from the ASF dual-hosted git repository.
rshah 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 605b922405 Update tpv2 ansible role: link tpv1Url with server.config
json (#7687)
605b922405 is described below
commit 605b92240500452ee048b9931d353fd980cc1b28
Author: Ekaterina Terekhova <[email protected]>
AuthorDate: Tue Aug 1 11:43:36 2023 -0600
Update tpv2 ansible role: link tpv1Url with server.config json (#7687)
* add tpv1Url to server.config json
* add tpv1Url to server.config json
---------
Co-authored-by: eterek111 <[email protected]>
---
infrastructure/ansible/roles/traffic_portal_v2/defaults/main.yml | 1 +
.../ansible/roles/traffic_portal_v2/templates/config_v2.json.j2 | 1 +
2 files changed, 2 insertions(+)
diff --git a/infrastructure/ansible/roles/traffic_portal_v2/defaults/main.yml
b/infrastructure/ansible/roles/traffic_portal_v2/defaults/main.yml
index 4bc8ed54ea..694e02547f 100644
--- a/infrastructure/ansible/roles/traffic_portal_v2/defaults/main.yml
+++ b/infrastructure/ansible/roles/traffic_portal_v2/defaults/main.yml
@@ -24,6 +24,7 @@ tpv2_conf_dir: /etc/traffic-portal
tpv2_insecure: true
tpv2_sslPort: 443
tpv2_to_base_url: "https://localhost:6443"
+tpv2_to_tpv1: "https://localhost:6443"
tpv2_useSSL: true
tpv2_ssl_ca_files:
- /etc/pki/tls/ca-localhost.crt
diff --git
a/infrastructure/ansible/roles/traffic_portal_v2/templates/config_v2.json.j2
b/infrastructure/ansible/roles/traffic_portal_v2/templates/config_v2.json.j2
index 93a0653ef3..2065536b20 100644
--- a/infrastructure/ansible/roles/traffic_portal_v2/templates/config_v2.json.j2
+++ b/infrastructure/ansible/roles/traffic_portal_v2/templates/config_v2.json.j2
@@ -16,6 +16,7 @@
"insecure": {{ tpv2_insecure | lower }},
"port": {{ tpv2_sslPort }},
"trafficOps": "{{ tpv2_to_base_url }}",
+ "tpv1Url": "{{ tpv2_to_tpv1 }}",
"certificateAuthPaths": [ "{{ tpv2_ssl_ca_files | join("', '") }}" ],
"useSSL": {{ tpv2_useSSL | lower }},
"certPath": "{{ tpv2_ssl_cert_file }}",