openstack
/
tripleo-ansible
Code Issues Proposed changes

Remove unnecessary designate worker conditional 

The designate worker network should now always be defined removing the
need for the if/elifs.

Depends-On: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/850943
Change-Id: I97c4fa8684d7298a6a1a60bfda61e7746c51b660
This commit is contained in:
Brent Eagles 2022-07-26 08:55:49 -02:30
parent a2573e3386
commit b7fee3e1db
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tripleo_ansible/roles/designate_rndc_config/templates/rndc.conf.j2
View File

@ -4,13 +4,8 @@ key "rndc-key" {
};
options {
{% if designate_worker_network is defined %}
{% set designate_worker_source_address = hostvars[inventory_hostname][designate_worker_network + "_ip"] %}
{% elif 'internal_api_ip' in hostvars[inventory_hostname] %}
{% set designate_worker_source_address = hostvars[inventory_hostname]['internal_api_ip'] %}
{% else %}
{% set designate_worker_source_address = hostvars[inventory_hostname]['ctlplane_ip'] %}
{% endif %}
{% if designate_worker_source_address|ipv4 %}
default-source-address {{ designate_worker_source_address }};
{% elif designate_worker_source_address|ipv6 %}