[CORD-2270]
Support head node on Ubuntu 16.04 (Xenial)
Change-Id: Ic13ea784b8fa55a481f08d21f5187fd37d13499c
diff --git a/roles/dns-nsd/templates/zone.forward.j2 b/roles/dns-nsd/templates/zone.forward.j2
index 613576f..86eae0c 100644
--- a/roles/dns-nsd/templates/zone.forward.j2
+++ b/roles/dns-nsd/templates/zone.forward.j2
@@ -1,4 +1,3 @@
-
{#
Copyright 2017-present Open Networking Foundation
@@ -15,10 +14,9 @@
limitations under the License.
#}
-
;## NSD authoritative only DNS
;## FORWARD Zone
-;# created by ansible
+;# created by dns-nsd/templates/zone.forward.j2
$ORIGIN {{ item.name }}. ; default zone domain
$TTL {{ item.ttl | default(dns_ttl) }} ; default time to live
@@ -37,9 +35,6 @@
{% endfor %}
;A and CNAME records
-{% if name_on_public_interface is defined %}
-{{ name_on_public_interface }} IN A {{ ansible_default_ipv4.address }}
-{% endif %}
{% if item.aliases is defined %}
{% for alias in item.aliases %}
{{ alias.name }} IN CNAME {{ alias.dest }}
@@ -50,7 +45,7 @@
; Created from nodelist: {{ nodelist }}
{% set nodes = vars[nodelist] %}
{% for node in nodes %}
-{{ node.name }} IN A {{ item.ipv4_first_octets ~ "." ~ node.ipv4_last_octet }}
+{{ node.name }} IN A {{ item.cidr | ipaddr(node.ipv4_last_octet) | ipaddr('address') }}
{% if node.aliases is defined %}
{% for alias in node.aliases %}
{{ alias }} IN CNAME {{ node.name }}