2 files changed, 22 insertions, 2 deletions
diff --git a/roles/core/ntp/templates/chrony.conf.j2 b/roles/core/ntp/templates/chrony.conf.j2
index 0bad9235..e404da18 100644
--- a/roles/core/ntp/templates/chrony.conf.j2
+++ b/roles/core/ntp/templates/chrony.conf.j2
@@ -47,10 +47,10 @@ allow {{ rule }}
 {%   for rule in ntp_server.deny | default([]) %}
 deny {{ rule }}
 {%   endfor %}
-{%   if 'bindaddress' in ntp_server %}
+{%   if 'bind' in ntp_server %}
 bindaddress {{ ntp_server.bind }}
 {%   endif %}
 {%   if 'port' in ntp_server %}
-  port {{ ntp_server.port }}
+port {{ ntp_server.port }}
 {%   endif %}
 {% endif %}
diff --git a/roles/core/ntp/templates/openntpd.conf.j2 b/roles/core/ntp/templates/openntpd.conf.j2
new file mode 100644
index 00000000..09a6a9c3
--- /dev/null
+++ b/roles/core/ntp/templates/openntpd.conf.j2
@@ -0,0 +1,20 @@
+### Client
+{%   if 'servers' in ntp_client %}
+
+{%     for server in ntp_client.servers %}
+server {{ server.name }}{% if 'options' in server %} {{ server.options }}{% endif %}{{ '' }}
+{%     endfor %}
+{%   endif %}
+{%   if 'pools' in ntp_client %}
+
+{%     for pool in ntp_client.pools %}
+servers {{ pool.name }}{% if 'options' in pool %} {{ pool.options }}{% endif %}{{ '' }}
+{%     endfor %}
+{%   endif %}
+{% if ntp_server is defined %}
+
+
+### Server
+
+listen on {{ ntp_server.bind | default('*') }}
+{% endif %}