core/ntp: add support for openbsd

8 files changed, 28 insertions, 3 deletions

diff --git a/roles/core/ntp/handlers/main.yml b/roles/core/ntp/handlers/main.yml
index 0f11a5da..fa1274e8 100644
--- a/roles/core/ntp/handlers/main.yml
+++ b/roles/core/ntp/handlers/main.yml
@@ -13,3 +13,8 @@
   service:
     name: openntpd
     state: restarted
+
+- name: restart ntpd
+  service:
+    name: ntpd
+    state: restarted
diff --git a/roles/core/ntp/tasks/chrony.yml b/roles/core/ntp/tasks/Debian_chrony.yml
index d220af30..d220af30 100644
--- a/roles/core/ntp/tasks/chrony.yml
+++ b/roles/core/ntp/tasks/Debian_chrony.yml
diff --git a/roles/core/ntp/tasks/openntpd.yml b/roles/core/ntp/tasks/Debian_openntpd.yml
index 76f62646..76f62646 100644
--- a/roles/core/ntp/tasks/openntpd.yml
+++ b/roles/core/ntp/tasks/Debian_openntpd.yml
diff --git a/roles/core/ntp/tasks/systemd-timesyncd.yml b/roles/core/ntp/tasks/Debian_systemd-timesyncd.yml
index 20a5f379..20a5f379 100644
--- a/roles/core/ntp/tasks/systemd-timesyncd.yml
+++ b/roles/core/ntp/tasks/Debian_systemd-timesyncd.yml
diff --git a/roles/core/ntp/tasks/OpenBSD_openntpd.yml b/roles/core/ntp/tasks/OpenBSD_openntpd.yml
new file mode 100644
index 00000000..947b23c4
--- /dev/null
+++ b/roles/core/ntp/tasks/OpenBSD_openntpd.yml
@@ -0,0 +1,6 @@
+---
+- name: install openntpd configuration
+  template:
+    src: openntpd.conf.j2
+    dest: /etc/ntpd.conf
+  notify: restart ntpd
diff --git a/roles/core/ntp/tasks/error.yml b/roles/core/ntp/tasks/error.yml
new file mode 100644
index 00000000..84a1a198
--- /dev/null
+++ b/roles/core/ntp/tasks/error.yml
@@ -0,0 +1,3 @@
+---
+- fail:
+    msg: "ntp variant '{{ ntp_variant }}' is not supported on this platform"
diff --git a/roles/core/ntp/tasks/main.yml b/roles/core/ntp/tasks/main.yml
index 77f281ff..d8c619a9 100644
--- a/roles/core/ntp/tasks/main.yml
+++ b/roles/core/ntp/tasks/main.yml
@@ -1,5 +1,14 @@
 ---
-## TODO: make this work on openbsd and debian/ubuntu
-- name: run ntp-variant specific tasks
+- name: load os/distrubtion/version specific tasks
   when: ntp_variant is defined
-  include_tasks: "{{ ntp_variant }}.yml"
+  vars:
+    params:
+      files:
+      - "{{ ansible_distribution_release }}_{{ ntp_variant }}.yml"
+      - "{{ ansible_distribution }}_{{ ntp_variant }}.yml"
+      - "{{ ansible_os_family }}_{{ ntp_variant }}.yml"
+      - "error.yml"
+  loop: "{{ q('first_found', params) }}"
+  loop_control:
+    loop_var: tasks_file
+  include_tasks: "{{ tasks_file }}"
diff --git a/roles/core/ntp/templates/openntpd.conf.j2 b/roles/core/ntp/templates/openntpd.conf.j2
index 09a6a9c3..3e2204f6 100644
--- a/roles/core/ntp/templates/openntpd.conf.j2
+++ b/roles/core/ntp/templates/openntpd.conf.j2
@@ -1,3 +1,4 @@
+{% if ntp_client is defined %}
 ### Client
 {%   if 'servers' in ntp_client %}
 
@@ -11,6 +12,7 @@ server {{ server.name }}{% if 'options' in server %} {{ server.options }}{% endi
 servers {{ pool.name }}{% if 'options' in pool %} {{ pool.options }}{% endif %}{{ '' }}
 {%     endfor %}
 {%   endif %}
+{% endif %}
 {% if ntp_server is defined %}