X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=templates%2Fnetworks%2Fphysical%2Frack.j2;h=1a43fbdca2be40e68b9cf1246508eda6dcb14364;hb=a87fe956a57bc2294926cdb1020ab74676f5739d;hp=516affc0744b5afcb39d0cf87925cbdf7c337cdf;hpb=448c76b7c60fab57ec2a9e3456b0ec6513ab0447;p=yaml_builds.git diff --git a/templates/networks/physical/rack.j2 b/templates/networks/physical/rack.j2 index 516affc..1a43fbd 100644 --- a/templates/networks/physical/rack.j2 +++ b/templates/networks/physical/rack.j2 @@ -101,9 +101,9 @@ data: end: {{yaml.networks.pxe.ranges.dhcp.end}} dns: domain: {% if 'dns' in yaml.networks.pxe and 'domain' in yaml.networks.pxe.dns %}{{yaml.networks.pxe.dns.domain}} - {% else %}{{yaml.dns.server_domain}} + {% else %}{{yaml.dns.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' @@ -161,9 +161,9 @@ data: end: {{yaml.networks.host.ranges.static.end}} dns: domain: {% if 'dns' in yaml.networks.host and 'domain' in yaml.networks.host.dns %}{{yaml.networks.host.dns.domain}} - {% else %}{{yaml.dns.server_domain}} + {% else %}{{yaml.dns.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'