From a17a2a1723a379b717526573b0745d656568ad10 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Tue, 11 Aug 2026 15:02:56 +0100 Subject: [PATCH] Switch out pool.ntp.org for Google and Cloudflare NTP pools --- cookbooks/ntp/attributes/default.rb | 2 +- cookbooks/ntp/templates/default/chrony.conf.erb | 7 ------- roles/appliwave.rb | 3 --- roles/bytemark.rb | 3 --- roles/carnet.rb | 6 ------ roles/epix.rb | 6 ------ roles/equinix-ams.rb | 3 --- roles/equinix-dub.rb | 3 --- roles/gandi.rb | 3 --- roles/inxza.rb | 3 --- roles/lyonix.rb | 6 ------ roles/scaleway.rb | 3 --- roles/teleservice.rb | 6 ------ roles/twds.rb | 6 ------ roles/umu.rb | 3 --- 15 files changed, 1 insertion(+), 62 deletions(-) diff --git a/cookbooks/ntp/attributes/default.rb b/cookbooks/ntp/attributes/default.rb index 33299d65b..4c9260534 100644 --- a/cookbooks/ntp/attributes/default.rb +++ b/cookbooks/ntp/attributes/default.rb @@ -1,2 +1,2 @@ -default[:ntp][:servers] = ["0.us.pool.ntp.org", "1.us.pool.ntp.org"] +default[:ntp][:servers] = ["time.google.com", "time.cloudflare.com"] default[:ntp][:tz] = "Etc/UTC" diff --git a/cookbooks/ntp/templates/default/chrony.conf.erb b/cookbooks/ntp/templates/default/chrony.conf.erb index 6d9a74999..4436146d7 100644 --- a/cookbooks/ntp/templates/default/chrony.conf.erb +++ b/cookbooks/ntp/templates/default/chrony.conf.erb @@ -9,13 +9,6 @@ confdir /etc/chrony/conf.d <% node[:ntp][:servers].each do |server| -%> pool <%= server %> iburst <% end -%> -# Add additional non-pool NTP servers -# pool.ntp.org can sometimes be aggressive with KoD -pool time.cloudflare.com iburst -server time1.google.com iburst -server time2.google.com iburst -server time3.google.com iburst -server time4.google.com iburst # Allow local queries for monitoring allow 127.0.0.1/32 diff --git a/roles/appliwave.rb b/roles/appliwave.rb index 25b4c3e7c..9968fbe8b 100644 --- a/roles/appliwave.rb +++ b/roles/appliwave.rb @@ -14,9 +14,6 @@ default_attributes( override_attributes( :networking => { :nameservers => ["185.73.206.93", "185.73.206.94"] - }, - :ntp => { - :servers => ["0.fr.pool.ntp.org", "1.fr.pool.ntp.org", "europe.pool.ntp.org"] } ) diff --git a/roles/bytemark.rb b/roles/bytemark.rb index 109a17208..07d4bc0d6 100644 --- a/roles/bytemark.rb +++ b/roles/bytemark.rb @@ -10,9 +10,6 @@ override_attributes( :networking => { :nameservers => ["8.8.8.8", "8.8.4.4"], :search => ["bm.openstreetmap.org", "openstreetmap.org"] - }, - :ntp => { - :servers => ["0.uk.pool.ntp.org", "1.uk.pool.ntp.org", "europe.pool.ntp.org"] } ) diff --git a/roles/carnet.rb b/roles/carnet.rb index 8ed5cb3f6..ddb1f83a4 100644 --- a/roles/carnet.rb +++ b/roles/carnet.rb @@ -10,12 +10,6 @@ default_attributes( :hosted_by => "CARNet" ) -override_attributes( - :ntp => { - :servers => ["0.hr.pool.ntp.org", "1.hr.pool.ntp.org", "europe.pool.ntp.org"] - } -) - run_list( "role[hr]" ) diff --git a/roles/epix.rb b/roles/epix.rb index 76b6de50f..9591e0c99 100644 --- a/roles/epix.rb +++ b/roles/epix.rb @@ -6,12 +6,6 @@ default_attributes( :location => "Katowice, Poland" ) -override_attributes( - :ntp => { - :servers => ["0.pl.pool.ntp.org", "1.pl.pool.ntp.org", "europe.pool.ntp.org"] - } -) - run_list( "role[pl]" ) diff --git a/roles/equinix-ams.rb b/roles/equinix-ams.rb index cb8a273ca..ddd09d551 100644 --- a/roles/equinix-ams.rb +++ b/roles/equinix-ams.rb @@ -51,9 +51,6 @@ override_attributes( :networking => { :nameservers => ["10.0.48.14", "8.8.8.8", "8.8.4.4"], :search => ["ams.openstreetmap.org", "openstreetmap.org"] - }, - :ntp => { - :servers => ["0.nl.pool.ntp.org", "1.nl.pool.ntp.org", "europe.pool.ntp.org"] } ) diff --git a/roles/equinix-dub.rb b/roles/equinix-dub.rb index 888ea4725..f7b187837 100644 --- a/roles/equinix-dub.rb +++ b/roles/equinix-dub.rb @@ -55,9 +55,6 @@ override_attributes( :networking => { :nameservers => ["10.0.64.2", "74.82.42.42", "2001:470:20::2"], :search => ["dub.openstreetmap.org", "openstreetmap.org"] - }, - :ntp => { - :servers => ["0.ie.pool.ntp.org", "1.ie.pool.ntp.org", "europe.pool.ntp.org"] } ) diff --git a/roles/gandi.rb b/roles/gandi.rb index 2fcd1084b..1feec0e04 100644 --- a/roles/gandi.rb +++ b/roles/gandi.rb @@ -9,9 +9,6 @@ default_attributes( override_attributes( :networking => { :nameservers => ["217.70.186.194", "217.70.186.193", "2001:4b98:dc2:49::193"] - }, - :ntp => { - :servers => ["0.lu.pool.ntp.org", "1.lu.pool.ntp.org", "europe.pool.ntp.org"] } ) diff --git a/roles/inxza.rb b/roles/inxza.rb index 96dd61a96..69f0c12d9 100644 --- a/roles/inxza.rb +++ b/roles/inxza.rb @@ -9,9 +9,6 @@ default_attributes( override_attributes( :networking => { :nameservers => ["196.10.52.52", "196.10.54.54", "196.10.55.55"] - }, - :ntp => { - :servers => ["0.za.pool.ntp.org", "1.za.pool.ntp.org", "africa.pool.ntp.org"] } ) diff --git a/roles/lyonix.rb b/roles/lyonix.rb index b37ccb05c..5437ff1f3 100644 --- a/roles/lyonix.rb +++ b/roles/lyonix.rb @@ -12,12 +12,6 @@ default_attributes( } ) -override_attributes( - :ntp => { - :servers => ["0.fr.pool.ntp.org", "1.fr.pool.ntp.org", "europe.pool.ntp.org"] - } -) - run_list( "role[fr]", "recipe[snmpd]" diff --git a/roles/scaleway.rb b/roles/scaleway.rb index 26833e17c..7d5621e15 100644 --- a/roles/scaleway.rb +++ b/roles/scaleway.rb @@ -9,9 +9,6 @@ default_attributes( override_attributes( :networking => { :nameservers => ["62.210.16.6", "62.210.16.7"] - }, - :ntp => { - :servers => ["0.fr.pool.ntp.org", "1.fr.pool.ntp.org", "europe.pool.ntp.org"] } ) diff --git a/roles/teleservice.rb b/roles/teleservice.rb index 8704fb679..909060b1e 100644 --- a/roles/teleservice.rb +++ b/roles/teleservice.rb @@ -6,12 +6,6 @@ default_attributes( :location => "Sjöbo, Sweden" ) -override_attributes( - :ntp => { - :servers => ["0.se.pool.ntp.org", "1.se.pool.ntp.org", "europe.pool.ntp.org"] - } -) - run_list( "role[se]" ) diff --git a/roles/twds.rb b/roles/twds.rb index 95bae64e5..98d7564c6 100644 --- a/roles/twds.rb +++ b/roles/twds.rb @@ -11,12 +11,6 @@ default_attributes( :location => "Taiwan" ) -override_attributes( - :ntp => { - :servers => ["0.tw.pool.ntp.org", "1.tw.pool.ntp.org", "asia.pool.ntp.org"] - } -) - run_list( "role[tw]" ) diff --git a/roles/umu.rb b/roles/umu.rb index 9e783264d..1f8287f1f 100644 --- a/roles/umu.rb +++ b/roles/umu.rb @@ -14,9 +14,6 @@ default_attributes( override_attributes( :networking => { :nameservers => ["130.239.18.251", "130.239.18.252", "130.239.1.90"] - }, - :ntp => { - :servers => ["0.se.pool.ntp.org", "1.se.pool.ntp.org", "europe.pool.ntp.org"] } ) -- 2.47.3