Skip to content
This repository was archived by the owner on Nov 24, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
- `TRAFFIC_ROUTER`-type Profiles no longer need to have names that match any kind of pattern (e.g. `CCR_.*`)
- [#4351](https://github.com/apache/trafficcontrol/issues/4351) Updated message to an informative one when deleting a delivery service.
- Updated Grove to use the TO API v3 client library
- Updated Ansible Roles to use Traffic Ops API v3

## [6.1.0] - 2022-01-18
### Added
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dl_sf_url: https://czf.kabletown.invalid
dl_to_user:
dl_to_user_password:
# TrafficOps API version to use
dl_to_api_version: 2.0
dl_to_api_version: 3.0
dl_target_api_url: "{{ dl_to_url }}/api/{{ dl_to_api_version }}"
# URL for the CZF file
dl_shallow_czf_url: "{{ dl_sf_url }}/czf.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -739,6 +739,7 @@
ip6Address: "{{ hostvars[item].not_autoconf_default_ipv6_address | default(hostvars[item].ansible_default_ipv6.address) | default(omit) }}"
ip6IsService: true
ip6Gateway: "{{ hostvars[item].ansible_default_ipv6.gateway | default(omit) }}"
monitorInterface: true
interfaceMtu: "{{ hostvars[item].ansible_default_ipv4.mtu | default('9000') }}"
default_inventory_hostname: "{{ hostvars[item].component | default('server') }}.kabletown.invalid"
merged_server_attrs: "{{ dl_ds_merged_servers['server.kabletown.invalid'] | combine(dl_ds_merged_servers[default_inventory_hostname] | default({}) ) | combine(dl_ds_merged_servers[item] | default({}) ) }}"
Expand Down Expand Up @@ -816,6 +817,7 @@
ip6Address: "{{ omit }}"
ip6IsService: true
ip6Gateway: "{{ omit }}"
monitorInterface: true
interfaceMtu: "9000"
default_inventory_hostname: "{{ hostvars[item].component | default('server') }}.kabletown.invalid"
merged_server_attrs: "{{ dl_ds_merged_servers['server.kabletown.invalid'] | combine(dl_ds_merged_servers[default_inventory_hostname] | default({}) ) | combine(dl_ds_merged_servers[item] | default({}) ) }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
ip6Address: "{{ item.ip6Address }}"
ip6IsService: "{{ item.ip6IsService }}"
ip6Gateway: "{{ item.ip6Gateway }}"
monitorInterface: "{{ item.monitorInterface }}"
interfaceMtu: "{{ item.interfaceMtu }}"
tcpPort: "{{ item.tcpPort }}"
httpsPort: "{{ item.httpsPort }}"
Expand Down
38 changes: 25 additions & 13 deletions infrastructure/ansible/roles/dataset_loader/templates/server.j2
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,6 @@
{% if xmppPasswd is defined and xmppPasswd is not none and xmppPasswd != omit and xmppPasswd %}
"xmppPasswd": "{{ xmppPasswd }}",
{% endif %}
{% if ip6Address is defined and ip6Address is not none and ip6Address != omit and ip6Address %}
"ip6Address": "{{ ip6Address }}",
"ip6IsService": {{ ip6IsService }},
{% endif %}
{% if ip6Gateway is defined and ip6Gateway is not none and ip6Gateway != omit and ip6Gateway %}
"ip6Gateway": "{{ ip6Gateway }}",
{% endif %}
{% if rack is defined and rack is not none and rack != omit and rack %}
"rack": "{{ rack }}",
{% endif %}
Expand Down Expand Up @@ -67,12 +60,31 @@
"hostName": "{{ hostName }}",
"domainName": "{{ domainName }}",
"cachegroupId": {{ cachegroupId }},
"interfaceName": "{{ interfaceName }}",
"ipAddress": "{{ ipAddress }}",
"ipIsService": {{ ipIsService }},
"ipNetmask": "{{ ipNetmask }}",
"ipGateway": "{{ ipGateway }}",
"interfaceMtu": {{ interfaceMtu }},
"interfaces": [
{
"ipAddresses": [
{% if ipAddress is defined and ipAddress is not none and ipAddress != omit and ipAddress %}
{
"address": "{{ (ipAddress + '/' + ipNetmask) | ipaddr }}",
"gateway": "{{ ipGateway }}",
"serviceAddress": {{ ipIsService }}
}{% if ip6Address is defined and ip6Address is not none and ip6Address != omit and ip6Address %},{% endif %}
{% endif %}
{% if ip6Address is defined and ip6Address is not none and ip6Address != omit and ip6Address %}
{
"address": "{{ ip6Address }}",
{% if ip6Gateway is defined and ip6Gateway is not none and ip6Gateway != omit and ip6Gateway %}
"gateway": "{{ ip6Gateway }}",
{% endif %}
"serviceAddress": {{ ip6IsService }}
}
{% endif %}
],
"monitor": {{ monitorInterface }},
"mtu": {{ interfaceMtu }},
"name": "{{ interfaceName }}"
}
],
"physLocationId": {{ physLocationId }},
"typeId": {{ typeId }},
"profileId": {{ profileId }},
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/ansible/sample.lab/ansible/vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ grovetccfg_version: "{{ grove_version }}"
influxdb_relay_version: adaa2ea-1
feigner_version: 1.0.0_dev_11248-1
ats_version: 7.1.4-2.el7
to_api_version: "2.0"
to_api_version: "3.0"

todb_username: traffic_ops
todb_db_name: traffic_ops
Expand Down