From: Tom Hughes <tom@compton.nu>
Date: Thu, 8 Oct 2020 19:19:46 +0000 (+0100)
Subject: Use a common set of default resolvers, defaulting to cloudflare
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/d4c71a0180b19a1ac263b21424eed15a14a568c7

Use a common set of default resolvers, defaulting to cloudflare
---

diff --git a/cookbooks/networking/attributes/default.rb b/cookbooks/networking/attributes/default.rb
index 23cd15eb0..8d369de4b 100644
--- a/cookbooks/networking/attributes/default.rb
+++ b/cookbooks/networking/attributes/default.rb
@@ -9,7 +9,7 @@ default[:networking][:firewall][:raw] = true
 default[:networking][:firewall][:mangle] = true
 default[:networking][:roles] = {}
 default[:networking][:interfaces] = {}
-default[:networking][:nameservers] = []
+default[:networking][:nameservers] = %w[1.1.1.1 1.0.0.1 2606:4700:4700::1111 2606:4700:4700::1001]
 default[:networking][:search] = []
 default[:networking][:dnssec] = "allow-downgrade"
 default[:networking][:hostname] = node.name
diff --git a/roles/aarnet.rb b/roles/aarnet.rb
index 55845b269..8cab0ea35 100644
--- a/roles/aarnet.rb
+++ b/roles/aarnet.rb
@@ -10,13 +10,13 @@ default_attributes(
   },
   :hosted_by => "AARNet",
   :location => "Carlton, Victoria, Australia",
-  :timezone => "Australia/Melbourne",
-  :networking => {
-    :nameservers => ["202.158.207.1", "202.158.207.2"]
-  }
+  :timezone => "Australia/Melbourne"
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["202.158.207.1", "202.158.207.2"]
+  },
   :ntp => {
     :servers => ["0.au.pool.ntp.org", "1.au.pool.ntp.org", "oceania.pool.ntp.org"]
   }
diff --git a/roles/altavoz.rb b/roles/altavoz.rb
index 8deb1dfda..ae9d720fc 100644
--- a/roles/altavoz.rb
+++ b/roles/altavoz.rb
@@ -3,16 +3,13 @@ description "Role applied to all servers at AltaVoz"
 
 default_attributes(
   :hosted_by => "AltaVoz",
-  :location => "Viña del Mar, Chile",
-  :networking => {
-    :nameservers => [
-      "200.91.44.10",
-      "200.91.41.10"
-    ]
-  }
+  :location => "Viña del Mar, Chile"
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["200.91.44.10", "200.91.41.10"]
+  },
   :ntp => {
     :servers => ["0.cl.pool.ntp.org", "1.cl.pool.ntp.org", "south-america.pool.ntp.org"]
   }
diff --git a/roles/blix.rb b/roles/blix.rb
index f58d760dc..5d54e1927 100644
--- a/roles/blix.rb
+++ b/roles/blix.rb
@@ -7,8 +7,5 @@ default_attributes(
       :blixadmin => { :status => :administrator }
     }
   },
-  :hosted_by => "Blix Solutions",
-  :networking => {
-    :nameservers => ["8.8.8.8", "8.8.4.4"]
-  }
+  :hosted_by => "Blix Solutions"
 )
diff --git a/roles/bytemark.rb b/roles/bytemark.rb
index 4e80daa56..7b0624752 100644
--- a/roles/bytemark.rb
+++ b/roles/bytemark.rb
@@ -5,7 +5,6 @@ default_attributes(
   :hosted_by => "Bytemark",
   :location => "York, England",
   :networking => {
-    :nameservers => ["10.0.32.20"],
     :roles => {
       :internal => {
         :inet => {
@@ -38,6 +37,7 @@ default_attributes(
 
 override_attributes(
   :networking => {
+    :nameservers => ["10.0.32.20"],
     :search => ["bm.openstreetmap.org", "openstreetmap.org"]
   },
   :ntp => {
diff --git a/roles/c3sl.rb b/roles/c3sl.rb
index de519e7d3..9b2bcc33f 100644
--- a/roles/c3sl.rb
+++ b/roles/c3sl.rb
@@ -9,14 +9,16 @@ default_attributes(
   },
   :hosted_by => "Centro de Computação Científica e Software Livre, Universidade Federal do Paraná",
   :location => "Curitiba, Brazil",
-  :timezone => "America/Sao_Paulo",
   :networking => {
-    :nameservers => ["200.17.202.3", "200.236.31.1"],
     :wireguard => { :keepalive => 180 }
-  }
+  },
+  :timezone => "America/Sao_Paulo"
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["200.17.202.3", "200.236.31.1"]
+  },
   :ntp => {
     :servers => ["0.br.pool.ntp.org", "1.br.pool.ntp.org", "south-america.pool.ntp.org"]
   }
diff --git a/roles/catalyst.rb b/roles/catalyst.rb
index 44319813f..413be9ed8 100644
--- a/roles/catalyst.rb
+++ b/roles/catalyst.rb
@@ -3,13 +3,13 @@ description "Role applied to all servers at Catalyst"
 
 default_attributes(
   :hosted_by => "Catalyst",
-  :location => "Hamilton, New Zealand",
-  :networking => {
-    :nameservers => ["202.78.244.85", "202.78.244.86", "202.78.244.87"]
-  }
+  :location => "Hamilton, New Zealand"
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["202.78.244.85", "202.78.244.86", "202.78.244.87"]
+  },
   :ntp => {
     :servers => ["0.nz.pool.ntp.org", "1.nz.pool.ntp.org", "oceania.pool.ntp.org"]
   }
diff --git a/roles/datahata.rb b/roles/datahata.rb
index 42b3d40f7..d257382c6 100644
--- a/roles/datahata.rb
+++ b/roles/datahata.rb
@@ -8,14 +8,7 @@ default_attributes(
     }
   },
   :hosted_by => "DataHata",
-  :location => "Minsk, Belarus",
-  :networking => {
-    :nameservers => [
-      "31.130.200.2",
-      "8.8.8.8",
-      "8.8.4.4"
-    ]
-  }
+  :location => "Minsk, Belarus"
 )
 
 override_attributes(
diff --git a/roles/delta.rb b/roles/delta.rb
index bf307528a..247cbda89 100644
--- a/roles/delta.rb
+++ b/roles/delta.rb
@@ -3,10 +3,7 @@ description "Role applied to all servers at Delta Telecom"
 
 default_attributes(
   :hosted_by => "Delta Telecom",
-  :location => "Baku, Azerbaijan",
-  :networking => {
-    :nameservers => ["94.20.20.20", "8.8.8.8", "8.8.4.4"]
-  }
+  :location => "Baku, Azerbaijan"
 )
 
 override_attributes(
diff --git a/roles/dotsrc.rb b/roles/dotsrc.rb
index 21838b72d..3b5f84509 100644
--- a/roles/dotsrc.rb
+++ b/roles/dotsrc.rb
@@ -3,17 +3,13 @@ description "Role applied to all servers at dotsrc.org"
 
 default_attributes(
   :hosted_by => "dotsrc.org",
-  :location => "Aalborg, Denmark",
-  :networking => {
-    :nameservers => [
-      "130.226.1.2",
-      "130.226.255.53",
-      "2001:878:0:100::2"
-    ]
-  }
+  :location => "Aalborg, Denmark"
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["130.226.1.2", "130.226.255.53", "2001:878:0:100::2"]
+  },
   :ntp => {
     :servers => ["0.dk.pool.ntp.org", "1.dk.pool.ntp.org", "europe.pool.ntp.org"]
   }
diff --git a/roles/drogon.rb b/roles/drogon.rb
index 1938270f9..8e4e50680 100644
--- a/roles/drogon.rb
+++ b/roles/drogon.rb
@@ -29,11 +29,7 @@ default_attributes(
         :prefix => "64",
         :gateway => "fe80::161:53:30:97"
       }
-    },
-    :nameservers => [
-      "161.53.30.100",
-      "8.8.8.8"
-    ]
+    }
   },
   :squid => {
     :version => 4,
diff --git a/roles/edgeuno.rb b/roles/edgeuno.rb
index c1224f2ba..d6fb53aef 100644
--- a/roles/edgeuno.rb
+++ b/roles/edgeuno.rb
@@ -32,10 +32,6 @@ default_attributes(
           :connection_limit => "-"
         }
       ]
-    },
-    :nameservers => [
-      "8.8.8.8",
-      "1.1.1.1"
-    ]
+    }
   }
 )
diff --git a/roles/equinix.rb b/roles/equinix.rb
index 625aa8f57..e04f7fac5 100644
--- a/roles/equinix.rb
+++ b/roles/equinix.rb
@@ -3,7 +3,6 @@ description "Role applied to all servers at Equinix"
 
 default_attributes(
   :networking => {
-    :nameservers => ["66.28.0.45", "66.28.0.61"],
     :roles => {
       :internal => {
         :inet => {
@@ -42,6 +41,7 @@ default_attributes(
 
 override_attributes(
   :networking => {
+    :nameservers => ["66.28.0.45", "66.28.0.61"],
     :search => ["ams.openstreetmap.org", "openstreetmap.org"]
   },
   :ntp => {
diff --git a/roles/euserv.rb b/roles/euserv.rb
index ec354bfe2..3270de618 100644
--- a/roles/euserv.rb
+++ b/roles/euserv.rb
@@ -3,15 +3,13 @@ description "Role applied to all servers at EUserv"
 
 default_attributes(
   :hosted_by => "EUserv",
-  :location => "Jena, Germany",
-  :networking => {
-    :nameservers => [
-      "85.31.184.60", "85.31.184.61", "85.31.185.60", "85.31.185.61"
-    ]
-  }
+  :location => "Jena, Germany"
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["85.31.184.60", "85.31.184.61", "85.31.185.60", "85.31.185.61"]
+  },
   :ntp => {
     :servers => ["0.de.pool.ntp.org", "1.de.pool.ntp.org", "europe.pool.ntp.org"]
   }
diff --git a/roles/exonetric.rb b/roles/exonetric.rb
index b03aa8c71..93068a76c 100644
--- a/roles/exonetric.rb
+++ b/roles/exonetric.rb
@@ -10,7 +10,6 @@ default_attributes(
   :hosted_by => "Exonetric",
   :location => "London, England",
   :networking => {
-    :nameservers => ["8.8.8.8", "8.8.4.4"],
     :roles => {
       :external => {
         :inet => {
diff --git a/roles/faimaison.rb b/roles/faimaison.rb
index a72fff50b..02ca7f353 100644
--- a/roles/faimaison.rb
+++ b/roles/faimaison.rb
@@ -3,14 +3,7 @@ description "Role applied to all servers at FAImaison"
 
 default_attributes(
   :hosted_by => "FAImaison",
-  :location => "France",
-  :networking => {
-    :nameservers => [
-      "8.8.8.8",
-      "8.8.4.4",
-      "1.1.1.1"
-    ]
-  }
+  :location => "France"
 )
 
 override_attributes(
diff --git a/roles/ffrl.rb b/roles/ffrl.rb
index 35599a01c..96109c443 100644
--- a/roles/ffrl.rb
+++ b/roles/ffrl.rb
@@ -3,13 +3,7 @@ description "Role applied to all servers at Freifunk Rheinland"
 
 default_attributes(
   :hosted_by => "Freifunk Rheinland",
-  :location => "Berlin, Germany",
-  :networking => {
-    :nameservers => [
-      "8.8.8.8",
-      "8.8.4.4"
-    ]
-  }
+  :location => "Berlin, Germany"
 )
 
 override_attributes(
diff --git a/roles/firefishynet.rb b/roles/firefishynet.rb
index fca212ad8..150f62d6f 100644
--- a/roles/firefishynet.rb
+++ b/roles/firefishynet.rb
@@ -3,7 +3,6 @@ description "Role applied to all servers at Firefishy"
 
 default_attributes(
   :networking => {
-    :nameservers => ["8.8.8.8", "8.8.4.4"],
     :roles => {
       :internal => {
         :inet => {
diff --git a/roles/gandi.rb b/roles/gandi.rb
index d1a332a15..2fcd1084b 100644
--- a/roles/gandi.rb
+++ b/roles/gandi.rb
@@ -3,17 +3,13 @@ description "Role applied to all servers at Gandi"
 
 default_attributes(
   :hosted_by => "Gandi",
-  :location => "Bissen, Luxembourg",
-  :networking => {
-    :nameservers => [
-      "217.70.186.194",
-      "217.70.186.193",
-      "2001:4b98:dc2:49::193"
-    ]
-  }
+  :location => "Bissen, Luxembourg"
 )
 
 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/greenmini.rb b/roles/greenmini.rb
index 16f7974d5..2156eb332 100644
--- a/roles/greenmini.rb
+++ b/roles/greenmini.rb
@@ -8,18 +8,13 @@ default_attributes(
     }
   },
   :hosted_by => "greenminihost",
-  :location => "Dronten, Netherlands",
-  :networking => {
-    :nameservers => [
-      "45.148.169.130",
-      "185.200.102.102",
-      "2a0a:aa42:222:2500::2500",
-      "2a0a:aa42:321:2000::53"
-    ]
-  }
+  :location => "Dronten, Netherlands"
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["45.148.169.130", "185.200.102.102", "2a0a:aa42:222:2500::2500", "2a0a:aa42:321:2000::53"]
+  },
   :ntp => {
     :servers => ["0.nl.pool.ntp.org", "1.nl.pool.ntp.org", "europe.pool.ntp.org"]
   }
diff --git a/roles/grifon.rb b/roles/grifon.rb
index c9653f93d..e7bf0b295 100644
--- a/roles/grifon.rb
+++ b/roles/grifon.rb
@@ -28,8 +28,7 @@ default_attributes(
           :connection_limit => "-"
         }
       ]
-    },
-    :nameservers => ["2a00:5884::7", "8.8.8.8", "8.8.4.4"]
+    }
   }
 )
 
diff --git a/roles/grnet.rb b/roles/grnet.rb
index 1ca197be5..a08d1841d 100644
--- a/roles/grnet.rb
+++ b/roles/grnet.rb
@@ -8,13 +8,7 @@ default_attributes(
     }
   },
   :hosted_by => "GRNET",
-  :location => "Athens, Greece",
-  :networking => {
-    :nameservers => [
-      "8.8.8.8",
-      "8.8.4.4"
-    ]
-  }
+  :location => "Athens, Greece"
 )
 
 override_attributes(
diff --git a/roles/hetzner.rb b/roles/hetzner.rb
index 20d855f65..4948c8d6c 100644
--- a/roles/hetzner.rb
+++ b/roles/hetzner.rb
@@ -2,7 +2,10 @@ name "hetzner"
 description "Role applied to all servers at Hetzner"
 
 default_attributes(
-  :hosted_by => "Hetzner",
+  :hosted_by => "Hetzner"
+)
+
+override_attributes(
   :networking => {
     :nameservers => [
       "213.133.98.98",
@@ -12,10 +15,7 @@ default_attributes(
       "2a01:4f8:0:a102::add:9999",
       "2a01:4f8:0:a0a1::add:1010"
     ]
-  }
-)
-
-override_attributes(
+  },
   :ntp => {
     :servers => ["0.de.pool.ntp.org", "1.de.pool.ntp.org", "europe.pool.ntp.org"]
   }
diff --git a/roles/hostedinnz.rb b/roles/hostedinnz.rb
index 7e0944309..9bf941404 100644
--- a/roles/hostedinnz.rb
+++ b/roles/hostedinnz.rb
@@ -9,9 +9,6 @@ default_attributes(
   },
   :hosted_by => "HostedIn.NZ",
   :location => "Wellington, New Zealand",
-  :networking => {
-    :nameservers => ["8.8.8.8", "8.8.4.4"]
-  },
   :snmpd => {
     :clients => ["103.106.66.28"],
     :community => "hostedinnz",
diff --git a/roles/inxza.rb b/roles/inxza.rb
index aa80ea347..96dd61a96 100644
--- a/roles/inxza.rb
+++ b/roles/inxza.rb
@@ -3,17 +3,13 @@ description "Role applied to all servers at INX-ZA"
 
 default_attributes(
   :hosted_by => "INX-ZA",
-  :location => "Cape Town, South Africa",
-  :networking => {
-    :nameservers => [
-      "196.10.52.52",
-      "196.10.54.54",
-      "196.10.55.55"
-    ]
-  }
+  :location => "Cape Town, South Africa"
 )
 
 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/iway.rb b/roles/iway.rb
index 3a4c1b888..094f92b0b 100644
--- a/roles/iway.rb
+++ b/roles/iway.rb
@@ -23,8 +23,7 @@ default_attributes(
           :connection_limit => "-"
         }
       ]
-    },
-    :nameservers => ["2001:8e0:ffff:ac1::1", "8.8.8.8", "8.8.4.4"]
+    }
   }
 )
 
diff --git a/roles/jump.rb b/roles/jump.rb
index 4186ecc4c..eb24ced21 100644
--- a/roles/jump.rb
+++ b/roles/jump.rb
@@ -3,18 +3,13 @@ description "Role applied to all servers at Jump Networks"
 
 default_attributes(
   :hosted_by => "Jump Networks",
-  :location => "London, England",
-  :networking => {
-    :nameservers => [
-      "185.73.44.3",
-      "2001:ba8:0:2c02::",
-      "2001:ba8:0:2c03::",
-      "2001:ba8:0:2c04::"
-    ]
-  }
+  :location => "London, England"
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["185.73.44.3", "2001:ba8:0:2c02::", "2001:ba8:0:2c03::", "2001:ba8:0:2c04::"]
+  },
   :ntp => {
     :servers => ["0.uk.pool.ntp.org", "1.uk.pool.ntp.org", "europe.pool.ntp.org"]
   }
diff --git a/roles/lyonix.rb b/roles/lyonix.rb
index 3a0c8589a..b44835628 100644
--- a/roles/lyonix.rb
+++ b/roles/lyonix.rb
@@ -4,9 +4,6 @@ description "Role applied to all servers at LyonIX"
 default_attributes(
   :hosted_by => "LyonIX",
   :location => "Lyon, France",
-  :networking => {
-    :nameservers => ["77.95.64.205", "77.95.64.206", "8.8.8.8", "8.8.4.4"]
-  },
   :snmpd => {
     :clients => ["77.95.64.0/21"],
     :clients6 => ["2a03:9180::/32", "2001:7f8:47::/48"],
diff --git a/roles/lysator.rb b/roles/lysator.rb
index 7bf25dc16..09c2aaff7 100644
--- a/roles/lysator.rb
+++ b/roles/lysator.rb
@@ -9,13 +9,13 @@ default_attributes(
     }
   },
   :hosted_by => "Lysator",
-  :location => "Linköping, Sweden",
-  :networking => {
-    :nameservers => ["130.236.254.225", "2001:6b0:17:f0a0::e1", "130.236.254.4"]
-  }
+  :location => "Linköping, Sweden"
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["130.236.254.225", "2001:6b0:17:f0a0::e1", "130.236.254.4"]
+  },
   :ntp => {
     :servers => ["0.se.pool.ntp.org", "1.se.pool.ntp.org", "europe.pool.ntp.org"]
   }
diff --git a/roles/milkywan.rb b/roles/milkywan.rb
index 7f75a2edc..d353814ab 100644
--- a/roles/milkywan.rb
+++ b/roles/milkywan.rb
@@ -23,8 +23,7 @@ default_attributes(
           :connection_limit => "-"
         }
       ]
-    },
-    :nameservers => ["130.117.11.11", "2a0b:cbc0:42::42"]
+    }
   }
 )
 
diff --git a/roles/nchc.rb b/roles/nchc.rb
index c376eb371..1c434df2a 100644
--- a/roles/nchc.rb
+++ b/roles/nchc.rb
@@ -11,12 +11,14 @@ default_attributes(
   :hosted_by => "NCHC",
   :location => "Hsinchu, Taiwan",
   :networking => {
-    :nameservers => ["140.110.16.1", "140.110.4.1"],
     :wireguard => { :keepalive => 180 }
   }
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["140.110.16.1", "140.110.4.1"]
+  },
   :ntp => {
     :servers => ["0.tw.pool.ntp.org", "1.tw.pool.ntp.org", "asia.pool.ntp.org"]
   }
diff --git a/roles/netalerts.rb b/roles/netalerts.rb
index 85e6824d4..bbccac112 100644
--- a/roles/netalerts.rb
+++ b/roles/netalerts.rb
@@ -4,16 +4,13 @@ description "Role applied to all servers at NetAlerts"
 default_attributes(
   :hosted_by => "NetAlerts",
   :location => "Montréal, Canada",
-  :timezone => "America/Montreal",
-  :networking => {
-    :nameservers => [
-      "209.172.41.202",
-      "209.172.41.200"
-    ]
-  }
+  :timezone => "America/Montreal"
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["209.172.41.202", "209.172.41.200"]
+  },
   :ntp => {
     :servers => ["0.ca.pool.ntp.org", "1.ca.pool.ntp.org", "north-america.pool.ntp.org"]
   }
diff --git a/roles/orm.rb b/roles/orm.rb
index 20abc51aa..860ab8c3d 100644
--- a/roles/orm.rb
+++ b/roles/orm.rb
@@ -51,12 +51,6 @@ default_attributes(
   }
 )
 
-override_attributes(
-  :networking => {
-    :nameservers => ["8.8.8.8", "8.8.4.4"]
-  }
-)
-
 run_list(
   "role[equinix]",
   "role[tyan-s7010]"
diff --git a/roles/osuosl.rb b/roles/osuosl.rb
index 489152a02..899176dcb 100644
--- a/roles/osuosl.rb
+++ b/roles/osuosl.rb
@@ -11,7 +11,6 @@ default_attributes(
   :location => "Corvallis, Oregon",
   :timezone => "PST8PDT",
   :networking => {
-    :nameservers => ["8.8.8.8", "8.8.4.4"],
     :roles => {
       :external => {
         :inet => {
diff --git a/roles/ovh.rb b/roles/ovh.rb
index 9a0e9d561..f8391a2aa 100644
--- a/roles/ovh.rb
+++ b/roles/ovh.rb
@@ -3,15 +3,13 @@ description "Role applied to all servers at OVH"
 
 default_attributes(
   :hosted_by => "OVH",
-  :location => "Roubaix, France",
-  :networking => {
-    :nameservers => [
-      "213.186.33.99"
-    ]
-  }
+  :location => "Roubaix, France"
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["213.186.33.99"]
+  },
   :ntp => {
     :servers => ["0.fr.pool.ntp.org", "1.fr.pool.ntp.org", "europe.pool.ntp.org"]
   }
diff --git a/roles/paulla.rb b/roles/paulla.rb
index 27149d247..516546968 100644
--- a/roles/paulla.rb
+++ b/roles/paulla.rb
@@ -12,13 +12,13 @@ default_attributes(
   :location => "Pau, France",
   :munin => {
     :allow => ["10.64.1.11"]
-  },
-  :networking => {
-    :nameservers => ["10.64.1.42", "194.167.156.13", "10.64.1.3"]
   }
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["10.64.1.42", "194.167.156.13", "10.64.1.3"]
+  },
   :ntp => {
     :servers => ["cannelle.paulla.asso.fr"]
   }
diff --git a/roles/prgmr.rb b/roles/prgmr.rb
index 918481423..de7ecb2e7 100644
--- a/roles/prgmr.rb
+++ b/roles/prgmr.rb
@@ -4,10 +4,7 @@ description "Role applied to all servers at prgmr.com"
 default_attributes(
   :hosted_by => "prgmr.com",
   :location => "San Francisco, California",
-  :timezone => "PST8PDT",
-  :networking => {
-    :nameservers => ["8.8.8.8", "8.8.4.4"]
-  }
+  :timezone => "PST8PDT"
 )
 
 override_attributes(
diff --git a/roles/rhaegal.rb b/roles/rhaegal.rb
index 2663eb79a..00fce56cf 100644
--- a/roles/rhaegal.rb
+++ b/roles/rhaegal.rb
@@ -37,11 +37,7 @@ default_attributes(
         :gateway => "10.5.0.1",
         :public_address => "161.53.248.77"
       }
-    },
-    :nameservers => [
-      "10.5.0.7",
-      "8.8.8.8"
-    ]
+    }
   },
   :postgresql => {
     :settings => {
diff --git a/roles/scaleway.rb b/roles/scaleway.rb
index b7daaa0fb..26833e17c 100644
--- a/roles/scaleway.rb
+++ b/roles/scaleway.rb
@@ -3,16 +3,13 @@ description "Role applied to all servers at Scaleway"
 
 default_attributes(
   :hosted_by => "Scaleway",
-  :location => "Paris, France",
-  :networking => {
-    :nameservers => [
-      "62.210.16.6",
-      "62.210.16.7"
-    ]
-  }
+  :location => "Paris, France"
 )
 
 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/shenron.rb b/roles/shenron.rb
index ee89e0a35..ebc507d1f 100644
--- a/roles/shenron.rb
+++ b/roles/shenron.rb
@@ -39,7 +39,6 @@ override_attributes(
         :gateway => "fe80::1"
       }
     },
-    :nameservers => ["8.8.8.8", "8.8.4.4"],
     :private_address => "10.0.16.100"
   }
 )
diff --git a/roles/strato.rb b/roles/strato.rb
index 05ed336cc..5cf4445dc 100644
--- a/roles/strato.rb
+++ b/roles/strato.rb
@@ -3,16 +3,13 @@ description "Role applied to all servers at Strato"
 
 default_attributes(
   :hosted_by => "Strato",
-  :location => "Germany",
-  :networking => {
-    :nameservers => [
-      "85.214.7.22",
-      "81.169.163.106"
-    ]
-  }
+  :location => "Germany"
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["85.214.7.22", "81.169.163.106"]
+  },
   :ntp => {
     :servers => ["0.de.pool.ntp.org", "1.de.pool.ntp.org", "europe.pool.ntp.org"]
   }
diff --git a/roles/szerverem.rb b/roles/szerverem.rb
index 45ac8108e..fc23d22f8 100644
--- a/roles/szerverem.rb
+++ b/roles/szerverem.rb
@@ -3,13 +3,7 @@ description "Role applied to all servers at szerverem.hu"
 
 default_attributes(
   :hosted_by => "szerverem.hu",
-  :location => "Budapest, Hungary",
-  :networking => {
-    :nameservers => [
-      "8.8.8.8",
-      "8.8.4.4"
-    ]
-  }
+  :location => "Budapest, Hungary"
 )
 
 override_attributes(
diff --git a/roles/teleservice.rb b/roles/teleservice.rb
index 7602c30c1..8704fb679 100644
--- a/roles/teleservice.rb
+++ b/roles/teleservice.rb
@@ -3,10 +3,7 @@ description "Role applied to all servers at Teleservice"
 
 default_attributes(
   :hosted_by => "Teleservice Skåne AB",
-  :location => "Sjöbo, Sweden",
-  :networking => {
-    :nameservers => ["8.8.8.8", "8.8.4.4"]
-  }
+  :location => "Sjöbo, Sweden"
 )
 
 override_attributes(
diff --git a/roles/teraswitch.rb b/roles/teraswitch.rb
index 1c24a529b..cbdab5d46 100644
--- a/roles/teraswitch.rb
+++ b/roles/teraswitch.rb
@@ -9,13 +9,7 @@ default_attributes(
   },
   :hosted_by => "TeraSwitch Networks",
   :location => "Pittsburgh, Pennsylvania",
-  :timezone => "EST5EDT",
-  :networking => {
-    :nameservers => [
-      "1.1.1.1",
-      "8.8.8.8"
-    ]
-  }
+  :timezone => "EST5EDT"
 )
 
 override_attributes(
diff --git a/roles/tetaneutral.rb b/roles/tetaneutral.rb
index 2459652ba..a15633023 100644
--- a/roles/tetaneutral.rb
+++ b/roles/tetaneutral.rb
@@ -8,13 +8,7 @@ default_attributes(
     }
   },
   :hosted_by => "Tetaneutral.net",
-  :location => "Toulouse, France",
-  :networking => {
-    :nameservers => [
-      "8.8.8.8",
-      "8.8.4.4"
-    ]
-  }
+  :location => "Toulouse, France"
 )
 
 override_attributes(
diff --git a/roles/tuxis.rb b/roles/tuxis.rb
index 3b4a8acbe..540879da7 100644
--- a/roles/tuxis.rb
+++ b/roles/tuxis.rb
@@ -3,13 +3,13 @@ description "Role applied to all servers at Tuxis"
 
 default_attributes(
   :hosted_by => "Tuxis",
-  :location => "Ede, Netherlands",
-  :networking => {
-    :nameservers => ["2a03:7900:2:0:31:3:104:61", "2a03:7900:2:0:31:3:104:62"]
-  }
+  :location => "Ede, Netherlands"
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["2a03:7900:2:0:31:3:104:61", "2a03:7900:2:0:31:3:104:62"]
+  },
   :ntp => {
     :servers => ["0.nl.pool.ntp.org", "1.nl.pool.ntp.org", "europe.pool.ntp.org"]
   }
diff --git a/roles/ucl.rb b/roles/ucl.rb
index 516c925d3..a0f5331f4 100644
--- a/roles/ucl.rb
+++ b/roles/ucl.rb
@@ -30,7 +30,7 @@ default_attributes(
 
 override_attributes(
   :networking => {
-    :nameservers => ["10.0.0.3", "8.8.8.8", "8.8.4.4"],
+    :nameservers => ["10.0.0.3", "1.1.1.1", "1.0.0.1"],
     :search => ["ucl.openstreetmap.org", "openstreetmap.org"]
   },
   :ntp => {
diff --git a/roles/umu.rb b/roles/umu.rb
index 33caf6148..9e783264d 100644
--- a/roles/umu.rb
+++ b/roles/umu.rb
@@ -8,13 +8,13 @@ default_attributes(
     }
   },
   :hosted_by => "Academic Computer Club, Umeå University",
-  :location => "Umeå, Sweden",
-  :networking => {
-    :nameservers => ["130.239.18.251", "130.239.18.252", "130.239.1.90"]
-  }
+  :location => "Umeå, Sweden"
 )
 
 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"]
   }
diff --git a/roles/unizar.rb b/roles/unizar.rb
index 746edaf88..efdf435de 100644
--- a/roles/unizar.rb
+++ b/roles/unizar.rb
@@ -8,13 +8,13 @@ default_attributes(
     }
   },
   :hosted_by => "University of Zaragoza",
-  :location => "Zaragoza, Spain",
-  :networking => {
-    :nameservers => ["155.210.12.9", "155.210.3.12"]
-  }
+  :location => "Zaragoza, Spain"
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["155.210.12.9", "155.210.3.12"]
+  },
   :ntp => {
     :servers => ["0.es.pool.ntp.org", "1.es.pool.ntp.org", "europe.pool.ntp.org"]
   }
diff --git a/roles/utelecom.rb b/roles/utelecom.rb
index 7f613872e..3d0eab25c 100644
--- a/roles/utelecom.rb
+++ b/roles/utelecom.rb
@@ -3,10 +3,7 @@ description "Role applied to all servers at Ukrainian Telecommunication Group"
 
 default_attributes(
   :hosted_by => "Ukrainian Telecommunication Group",
-  :location => "Kiev, Ukraine",
-  :networking => {
-    :nameservers => ["8.8.8.8", "8.8.4.4"]
-  }
+  :location => "Kiev, Ukraine"
 )
 
 override_attributes(
diff --git a/roles/viserion.rb b/roles/viserion.rb
index 33675f1aa..03bbc3c05 100644
--- a/roles/viserion.rb
+++ b/roles/viserion.rb
@@ -32,13 +32,7 @@ default_attributes(
         :prefix => "64",
         :gateway => "2001:b68:4cff:3::1"
       }
-    },
-    :nameservers => [
-      "8.8.8.8",
-      "8.8.4.4",
-      "2001:4860:4860::8888",
-      "2001:4860:4860::8844"
-    ]
+    }
   },
   :squid => {
     :version => 4,
diff --git a/roles/vodafone-cz.rb b/roles/vodafone-cz.rb
index d23ab154f..fa7c1fdfd 100644
--- a/roles/vodafone-cz.rb
+++ b/roles/vodafone-cz.rb
@@ -3,13 +3,13 @@ description "Role applied to all servers at Vodafone CZ"
 
 default_attributes(
   :hosted_by => "Vodafone",
-  :location => "Prague, Czech Republic",
-  :networking => {
-    :nameservers => ["62.24.64.2", "2a02:8301:0:10::3", "2001:4860:4860::8888"]
-  }
+  :location => "Prague, Czech Republic"
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["62.24.64.2", "2a02:8301:0:10::3"]
+  },
   :ntp => {
     :servers => ["0.cz.pool.ntp.org", "1.cz.pool.ntp.org", "europe.pool.ntp.org"]
   }
diff --git a/roles/yandex.rb b/roles/yandex.rb
index b6c42e88a..9acde36c1 100644
--- a/roles/yandex.rb
+++ b/roles/yandex.rb
@@ -6,7 +6,6 @@ default_attributes(
   :location => "Moscow, Russia",
   :timezone => "Europe/Moscow",
   :networking => {
-    :nameservers => ["8.8.8.8", "8.8.4.4"],
     :wireguard => { :keepalive => 180 }
   }
 )
diff --git a/roles/zcu.rb b/roles/zcu.rb
index cfa1f63fc..8420c54d9 100644
--- a/roles/zcu.rb
+++ b/roles/zcu.rb
@@ -3,13 +3,13 @@ description "Role applied to all servers at University of West Bohemia"
 
 default_attributes(
   :hosted_by => "University of West Bohemia",
-  :location => "Pilsen, Czech Republic",
-  :networking => {
-    :nameservers => ["147.228.3.3", "147.228.52.11"]
-  }
+  :location => "Pilsen, Czech Republic"
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["147.228.3.3", "147.228.52.11"]
+  },
   :ntp => {
     :servers => ["0.cz.pool.ntp.org", "1.cz.pool.ntp.org", "europe.pool.ntp.org"]
   }