trafficcontrol-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jhg...@apache.org
Subject [trafficcontrol] 03/04: Downcase the cdn routing names
Date Wed, 18 Sep 2019 17:26:11 GMT
This is an automated email from the ASF dual-hosted git repository.

jhg03a pushed a commit to branch ansible.refactor
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git

commit 5a074c8f19d4ff36c55506bbcd0ea6a9ad481bdd
Author: Jonathan Gray <Jonathan_Gray@comcast.com>
AuthorDate: Mon Sep 16 18:29:33 2019 -0600

    Downcase the cdn routing names
    
    Post-install is case-sensitive, but the API isn't.  This bypasses an issue with the default
not being idempotent across reruns.
---
 infrastructure/ansible/roles/dataset_loader/defaults/main.yml | 2 +-
 infrastructure/ansible/roles/traffic_ops/defaults/main.yml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/infrastructure/ansible/roles/dataset_loader/defaults/main.yml b/infrastructure/ansible/roles/dataset_loader/defaults/main.yml
index d9d99ed..80e70fe 100644
--- a/infrastructure/ansible/roles/dataset_loader/defaults/main.yml
+++ b/infrastructure/ansible/roles/dataset_loader/defaults/main.yml
@@ -60,7 +60,7 @@ dl_grove_ram_cache_size_mb: "{{ dl_grove_ram_cache_size_percentage / 100
* ( dl_
 # TO CDN
 dl_ds_merged_cdns: "{{ dl_ds_default_cdns }}"
 dl_ds_default_cdns:
-  MKGA:
+  mkga:
     name: Kabletown2.0
     dnssecEnabled: false
 
diff --git a/infrastructure/ansible/roles/traffic_ops/defaults/main.yml b/infrastructure/ansible/roles/traffic_ops/defaults/main.yml
index 0d1c03d..b78133f 100644
--- a/infrastructure/ansible/roles/traffic_ops/defaults/main.yml
+++ b/infrastructure/ansible/roles/traffic_ops/defaults/main.yml
@@ -139,7 +139,7 @@ to_pi_openssl_common_name: "{{ ansible_hostname }}"
 to_pi_openssl_rsa_passphrase:
 
 # --- postinstall profiles.json
-to_pi_cdn_name: MKGA
+to_pi_cdn_name: "{{ hostvars[groups['traffic_router'] | first].cdn | default('mkga') | lower
}}"
 to_pi_health_polling_interval: "8000"
 to_pi_dns_subdomain: "{{ to_pi_cdn_name }}.{{ ansible_domain }}"
 to_pi_soa_admin: "traffic_ops"


Mime
View raw message