From b7fee3e1db48f505dea010e4284066017eb9d93f Mon Sep 17 00:00:00 2001 From: Brent Eagles Date: Tue, 26 Jul 2022 08:55:49 -0230 Subject: [PATCH] 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 --- .../roles/designate_rndc_config/templates/rndc.conf.j2 | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tripleo_ansible/roles/designate_rndc_config/templates/rndc.conf.j2 b/tripleo_ansible/roles/designate_rndc_config/templates/rndc.conf.j2 index a481d4103..901cfbfff 100644 --- a/tripleo_ansible/roles/designate_rndc_config/templates/rndc.conf.j2 +++ b/tripleo_ansible/roles/designate_rndc_config/templates/rndc.conf.j2 @@ -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 %}