From 3efbbd95c8d822596914fb11615b6b7767734ca7 Mon Sep 17 00:00:00 2001
From: Sven Velt <sven@velt.de>
Date: Wed, 2 Dec 2020 22:07:40 +0100
Subject: [PATCH] Add pools to servers

---
 roles/timesync-enabled/defaults/main.yml            |  7 ++++++-
 roles/timesync-enabled/tasks/main.yml               | 13 ++++++++++---
 roles/timesync-enabled/templates/etc/ntp.conf.j2    |  5 ++++-
 .../templates/etc/systemd/timesyncd.conf.j2         |  2 +-
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/roles/timesync-enabled/defaults/main.yml b/roles/timesync-enabled/defaults/main.yml
index 0247317..df3c1bc 100644
--- a/roles/timesync-enabled/defaults/main.yml
+++ b/roles/timesync-enabled/defaults/main.yml
@@ -1,10 +1,15 @@
 ---
 timesync_daemon: "ntp"
 
-timesync_default_servers:
+timesync_default_pools:
   - 0.de.pool.ntp.org
   - 1.de.pool.ntp.org
   - 2.de.pool.ntp.org
   - 3.de.pool.ntp.org
 
+timesync_default_servers:
+  - ptbtime1.ptb.de
+  - ptbtime2.ptb.de
+  - ptbtime3.ptb.de
+
 
diff --git a/roles/timesync-enabled/tasks/main.yml b/roles/timesync-enabled/tasks/main.yml
index 14fdd96..4d25c9f 100644
--- a/roles/timesync-enabled/tasks/main.yml
+++ b/roles/timesync-enabled/tasks/main.yml
@@ -7,13 +7,20 @@
 
 - name: Include each network variables if there is no host variable
   include_vars: "vars/timesync_{{ ansible_default_ipv4.network }}.yml"
-  when: ansible_default_ipv4 and timesync_servers is not defined
+  when: ansible_default_ipv4 and (timesync_servers|default(False) == False and timesync_pools|default(False) == False)
 
 
-- name: Set NTP server for machines without default gateway
+- name: "Set NTP »pools« for machines without default gateway"
+  set_fact:
+    timesync_pools: "{{ timesync_default_pools }}"
+  when: timesync_servers|default(False) == False and timesync_pools|default(False) == False
+
+
+- name: "Set NTP »server« for machines without default gateway"
   set_fact:
     timesync_servers: "{{ timesync_default_servers }}"
-  when: timesync_servers is not defined
+  when: timesync_servers|default(False) == False and timesync_pools|default(False) == False
+
 
 
 - name: Include OS dependent variables
diff --git a/roles/timesync-enabled/templates/etc/ntp.conf.j2 b/roles/timesync-enabled/templates/etc/ntp.conf.j2
index c0edc60..1c7b839 100644
--- a/roles/timesync-enabled/templates/etc/ntp.conf.j2
+++ b/roles/timesync-enabled/templates/etc/ntp.conf.j2
@@ -11,10 +11,13 @@ filegen loopstats file loopstats type day enable
 filegen peerstats file peerstats type day enable
 filegen clockstats file clockstats type day enable
 
-# NTP server pool
+# NTP servers
 {% for server in timesync_servers|default(["pool.ntp.org"]) %}server {{ server }} iburst
 {% endfor %}
 
+# NTP pools
+{% for pool in timesync_pools|default([]) %}pool {{ pool }} iburst
+{% endfor %}
 
 # Access control configuration
 # By default, exchange time with everybody, but don't allow configuration.
diff --git a/roles/timesync-enabled/templates/etc/systemd/timesyncd.conf.j2 b/roles/timesync-enabled/templates/etc/systemd/timesyncd.conf.j2
index 7947d86..75afa09 100644
--- a/roles/timesync-enabled/templates/etc/systemd/timesyncd.conf.j2
+++ b/roles/timesync-enabled/templates/etc/systemd/timesyncd.conf.j2
@@ -3,7 +3,7 @@
 # See timesyncd.conf(5) for details.
 
 [Time]
-NTP={{ timesync_servers|default([])|join(' ') }}
+NTP={{ timesync_pools|default([])|join(' ') }} {{ timesync_servers|default([])|join(' ') }}
 {% if timesync_servers_fallback|default([]) %}FallbackNTP={{ timesync_servers_fallback|join(' ') }}
 {% else %}#FallbackNTP=
 {% endif %}