From 223e310bc2338bb5f86c3a3de31f69361eba2f73 Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Tue, 11 May 2021 22:29:48 +0200
Subject: [PATCH] Remove default time sources from customisable configuration

It seems unlikely that anyone would want to extend the time servers
variable, so let's keep it simple and not add an additional variable
where one isn't necessary. This is also consistent with how we configure
DNS.

These variables haven't made it into an official release yet, so now
is the time to clean up.

Change-Id: I3c15c6976296abf9c78f1480c1779b854145c7ca
---
 ansible/group_vars/all/time | 18 +++++++-----------
 etc/kayobe/time.yml         |  3 ---
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/ansible/group_vars/all/time b/ansible/group_vars/all/time
index 6ab7708e1..d37a1a83e 100644
--- a/ansible/group_vars/all/time
+++ b/ansible/group_vars/all/time
@@ -10,15 +10,6 @@ timezone: "{{ ansible_date_time.tz }}"
 ###############################################################################
 # Network Time Protocol (NTP).
 
-# Kayobe default time sources
-chrony_ntp_servers_default:
-  - server: pool.ntp.org
-    type: pool
-    options:
-      - option: iburst
-      - option: minpoll
-        val: 8
-
 # List of NTP time sources to configure. Format is a list of dictionaries with
 # the following keys:
 # server:  host or pool
@@ -37,5 +28,10 @@ chrony_ntp_servers_default:
 #       - option: maxsources
 #         val: 3
 #
-chrony_ntp_servers: "{{ chrony_ntp_servers_default }}"
-###############################################################################
+chrony_ntp_servers:
+  - server: pool.ntp.org
+    type: pool
+    options:
+      - option: iburst
+      - option: minpoll
+        val: 8
diff --git a/etc/kayobe/time.yml b/etc/kayobe/time.yml
index f5a0cbbfd..23c1d0dc4 100644
--- a/etc/kayobe/time.yml
+++ b/etc/kayobe/time.yml
@@ -10,9 +10,6 @@
 ###############################################################################
 # Network Time Protocol (NTP).
 
-# Kayobe default time sources
-#chrony_ntp_servers_default:
-
 # List of NTP time sources to configure. Format is a list of dictionaries with
 # the following keys:
 # server:  host or pool