- Removed NTP client, moved to a seperate role.

README.rst

@@ -28,7 +28,6 @@ Role Variables
     collectd_riemann_server:
     collectd_collectd_server:
     collectd_statsd_server:
-    ntp:
     unattended_upgrades:
     tls_cert: # Filename of the TLS cert for that host.
     tls_key: # Filename of the TLS key for that host.
@@ -84,7 +83,6 @@ TODO
 
 - Implement:
   - collectd_agent.
-  - ldap_login (with pam_mkhomedir).
   - ssh_ca.
   - syslog_forwarding.
 - Test.

handlers/main.yml

@@ -18,13 +18,3 @@
   service:
     name: collectd
     state: restarted
-
-- name: Restart ntpd
-  service:
-    name: '{{ ntpd_service[ansible_os_family] }}'
-    state: restarted
-
-- name: Restart systemd-timesyncd
-  service:
-    name: systemd-timesyncd
-    state: restarted

tasks/main.yml

@@ -29,9 +29,6 @@
 - include: collectd_agent.yml
   when: (collectd_graphite_server is defined or collectd_riemann_server is defined or collectd_collectd_server is defined or collectd_statsd_server is defined) and not common_role_finished is defined
 
-- include: ntp.yml
-  when: ntp|default(True) and not common_role_finished is defined
-
 - include: unattended_upgrades.yml
   when: unattended_upgrades|default(True) and ansible_os_family == 'Debian' and not common_role_finished is defined
 

tasks/ntp.yml

----
-
-- name: Assert
-  assert:
-    that: ansible_os_family in [ 'Debian', 'OpenBSD' ]
-
-- include: ntpd.yml
-  when: ansible_service_mgr in [ ]
-
-- include: systemd-timesyncd.yml
-  when: ansible_service_mgr == 'systemd'

tasks/ntpd.yml

----
-
-- assert:
-    that: ansible_os_family in [ 'Debian', 'OpenBSD' ]
-
-- name: apt install ntpd
-  when: ansible_pkg_mgr == 'apt'
-  apt:
-    name: ntp
-    state: present
-    update_cache: yes
-    cache_valid_time: 3600
-
-- name: Configure ntpd
-  template:
-    src: ntpd.conf.j2
-    dest: '{{ ntpd_conf[ansible_os_family] }}'
-    owner: root
-    group: 0
-    mode: 0o0644
-  notify:
-  - Restart ntpd
-
-- name: Enable ntpd
-  service:
-    name: '{{ ntpd_service[ansible_os_family] }}'
-    enabled: yes
-    state: started

tasks/systemd-timesyncd.yml

----
-
-- name: Configure systemd-timesyncd
-  lineinfile:
-    dest: /etc/systemd/timesyncd.conf
-    line: 'NTP=0.debian.pool.ntp.org 1.debian.pool.ntp.org 2.debian.pool.ntp.org 3.debian.pool.ntp.org'
-    regexp: '^NTP='
-    state: present
-  notify:
-  - 'Restart systemd-timesyncd'
-
-- name: Enable systemd-timesyncd
-  service:
-    name: systemd-timesyncd
-    enabled: yes
-    state: started

templates/ntpd.conf.j2

-{% for i in range(4) %}
-server {{ i }}.{{ ntp_pool[ansible_os_family] }}
-{% endfor %}

vars/main.yml

@@ -32,15 +32,3 @@ update_ca_certificates:
 cert_dir:
     OpenBSD: /etc/ssl/certs
     Debian: /usr/local/share/ca-certificates
-
-ntpd_conf:
-    OpenBSD: /etc/ntpd.conf
-    Debian: /etc/ntp.conf
-
-ntp_pool:
-    OpenBSD: pool.ntp.org
-    Debian: debian.pool.ntp.org
-
-ntpd_service:
-    OpenBSD: ntpd
-    Debian: ntp