Merge branch 'topic/core-ntp'

10 files changed, 189 insertions, 0 deletions

diff --git a/roles/core/ntp/defaults/main.yml b/roles/core/ntp/defaults/main.yml
new file mode 100644
index 00000000..08e0ca80
--- /dev/null
+++ b/roles/core/ntp/defaults/main.yml
@@ -0,0 +1,28 @@
+---
+# ntp_variant: systemd-timesyncd
+# ntp_variant: chrony
+# ntp_variant: openntpd
+
+
+# ntp_client:
+#   servers:
+#   - name: ntp.example.com
+#     options: iburst ...
+#   pools:
+#   - name: pool.example.com
+#     options: iburst ....
+#   peers:
+#   - name: peer.example.com
+#     options: iburst ....
+
+
+# ntp_hwtimestamp_interfaces:
+#   - name: "*"
+#     options: ....
+
+
+# ntp_server:
+#   allow: []
+#   deny: []
+#   bind: 0.0.0.0
+#   port: 123
diff --git a/roles/core/ntp/handlers/main.yml b/roles/core/ntp/handlers/main.yml
new file mode 100644
index 00000000..fa1274e8
--- /dev/null
+++ b/roles/core/ntp/handlers/main.yml
@@ -0,0 +1,20 @@
+---
+- name: restart chrony
+  service:
+    name: chrony
+    state: restarted
+
+- name: restart systemd-timesyncd
+  service:
+    name: systemd-timesyncd
+    state: restarted
+
+- name: restart openntpd
+  service:
+    name: openntpd
+    state: restarted
+
+- name: restart ntpd
+  service:
+    name: ntpd
+    state: restarted
diff --git a/roles/core/ntp/tasks/Debian_chrony.yml b/roles/core/ntp/tasks/Debian_chrony.yml
new file mode 100644
index 00000000..d220af30
--- /dev/null
+++ b/roles/core/ntp/tasks/Debian_chrony.yml
@@ -0,0 +1,11 @@
+---
+- name: install chrony
+  apt:
+    name: chrony
+    state: present
+
+- name: install chrony configuration
+  template:
+    src: chrony.conf.j2
+    dest: /etc/chrony/chrony.conf
+  notify: restart chrony
diff --git a/roles/core/ntp/tasks/Debian_openntpd.yml b/roles/core/ntp/tasks/Debian_openntpd.yml
new file mode 100644
index 00000000..76f62646
--- /dev/null
+++ b/roles/core/ntp/tasks/Debian_openntpd.yml
@@ -0,0 +1,11 @@
+---
+- name: install openntpd
+  apt:
+    name: openntpd
+    state: present
+
+- name: install openntpd configuration
+  template:
+    src: openntpd.conf.j2
+    dest: /etc/openntpd/ntpd.conf
+  notify: restart openntpd
diff --git a/roles/core/ntp/tasks/Debian_systemd-timesyncd.yml b/roles/core/ntp/tasks/Debian_systemd-timesyncd.yml
new file mode 100644
index 00000000..20a5f379
--- /dev/null
+++ b/roles/core/ntp/tasks/Debian_systemd-timesyncd.yml
@@ -0,0 +1,18 @@
+---
+- name: set ntp servers
+  when:
+  - ntp_client is defined
+  - "'servers' in ntp_client"
+  lineinfile:
+    path: /etc/systemd/timesyncd.conf
+    regexp: '^#?NTP='
+    line: "NTP={{ ntp_client.servers | map(attribute='name') | join(' ') }}"
+  notify: restart systemd-timesyncd
+
+- name: un-set ntp servers
+  when: "ntp_client is not defined or 'servers' not in ntp_client"
+  lineinfile:
+    path: /etc/systemd/timesyncd.conf
+    regexp: '^#?NTP='
+    line: "#NTP="
+  notify: restart systemd-timesyncd
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
new file mode 100644
index 00000000..d8c619a9
--- /dev/null
+++ b/roles/core/ntp/tasks/main.yml
@@ -0,0 +1,14 @@
+---
+- name: load os/distrubtion/version specific tasks
+  when: ntp_variant is defined
+  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/chrony.conf.j2 b/roles/core/ntp/templates/chrony.conf.j2
new file mode 100644
index 00000000..e404da18
--- /dev/null
+++ b/roles/core/ntp/templates/chrony.conf.j2
@@ -0,0 +1,56 @@
+### Global options
+
+cmdport 0
+keyfile /etc/chrony/chrony.keys
+driftfile /var/lib/chrony/chrony.drift
+logdir /var/log/chrony
+maxupdateskew 100.0
+rtcsync
+makestep 1 3
+{% if ntp_hwtimestamp_interfaces is defined %}
+
+{%   for interface in ntp_hwtimestamp_interfaces %}
+hwtimestamp {{ interface.name }}{% if 'options' in interface %} {{ interface.options }}{% endif %}{{ '' }}
+{%   endfor %}
+{% endif %}
+{% if ntp_client is defined %}
+
+
+### 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 %}
+pool {{ pool.name }}{% if 'options' in pool %} {{ pool.options }}{% endif %}{{ '' }}
+{%     endfor %}
+{%   endif %}
+{%   if 'peers' in ntp_client %}
+
+{%     for peer in ntp_client.peers %}
+peer {{ peer.name }}{% if 'options' in peer %} {{ peer.options }}{% endif %}{{ '' }}
+{%     endfor %}
+{%   endif %}
+{% endif %}
+{% if ntp_server is defined %}
+
+
+### Server
+
+{%   for rule in ntp_server.allow | default([]) %}
+allow {{ rule }}
+{%   endfor %}
+{%   for rule in ntp_server.deny | default([]) %}
+deny {{ rule }}
+{%   endfor %}
+{%   if 'bind' in ntp_server %}
+bindaddress {{ ntp_server.bind }}
+{%   endif %}
+{%   if 'port' in ntp_server %}
+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..3e2204f6
--- /dev/null
+++ b/roles/core/ntp/templates/openntpd.conf.j2
@@ -0,0 +1,22 @@
+{% if ntp_client is defined %}
+### 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 %}
+{% endif %}
+{% if ntp_server is defined %}
+
+
+### Server
+
+listen on {{ ntp_server.bind | default('*') }}
+{% endif %}