From 32afa4968f2c93a8c647ff8a29714540db3f1823 Mon Sep 17 00:00:00 2001 From: davidplunkett Date: Thu, 21 Mar 2019 01:38:49 +0000 Subject: [PATCH] improved jinja2 syntax for dns entries Change-Id: I51dcb760b5b529992df60f29095d4454bff8db13 Signed-off-by: davidplunkett --- templates/networks/common-addresses.j2 | 2 +- templates/networks/physical/rack.j2 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/networks/common-addresses.j2 b/templates/networks/common-addresses.j2 index d4323db..95cd802 100644 --- a/templates/networks/common-addresses.j2 +++ b/templates/networks/common-addresses.j2 @@ -36,7 +36,7 @@ data: {% for server in yaml.dns.upstream_servers %} - {{server}} {% endfor %} - upstream_servers_joined: '{{yaml.dns.upstream_servers[0]}}{% if yaml.dns.upstream_servers|length > 1 %},{{yaml.dns.upstream_servers[1]}}{% endif %}' + upstream_servers_joined: '{{yaml.dns.upstream_servers|batch(2)|first|join(',')}}' ingress_domain: {{yaml.dns.ingress_domain}} genesis: hostname: {{yaml.genesis.name}} diff --git a/templates/networks/physical/rack.j2 b/templates/networks/physical/rack.j2 index 516affc..f2a24a2 100644 --- a/templates/networks/physical/rack.j2 +++ b/templates/networks/physical/rack.j2 @@ -103,7 +103,7 @@ data: domain: {% if 'dns' in yaml.networks.pxe and 'domain' in yaml.networks.pxe.dns %}{{yaml.networks.pxe.dns.domain}} {% else %}{{yaml.dns.server_domain}} {% endif %} - servers: '{% if 'dns' in yaml.networks.pxe %}{{yaml.networks.pxe.dns.servers}}{% else %}{% for s in yaml.dns.upstream_servers %}{{s}} {% endfor %}{% endif %}' + servers: '{% if 'dns' in yaml.networks.pxe %}{{yaml.networks.pxe.dns.servers}}{% else %}{{yaml.dns.upstream_servers|join(' ')}}{% endif %}' ... --- schema: 'drydock/NetworkLink/v1' @@ -163,7 +163,7 @@ data: domain: {% if 'dns' in yaml.networks.host and 'domain' in yaml.networks.host.dns %}{{yaml.networks.host.dns.domain}} {% else %}{{yaml.dns.server_domain}} {% endif %} - servers: '{% if 'dns' in yaml.networks.host %}{{yaml.networks.host.dns.servers}}{% else %}{% for s in yaml.dns.upstream_servers %}{{s}} {% endfor %}{% endif %}' + servers: '{% if 'dns' in yaml.networks.host %}{{yaml.networks.host.dns.servers}}{% else %}{{yaml.dns.upstream_servers|join(' ')}}{% endif %}' ... --- schema: 'drydock/Network/v1' -- 2.16.6