Simplify firewall zones

Move all hosts except those at Equiniz, UCL and Bytemark into the osm zone.

diff --git a/roles/altavoz.rb b/roles/altavoz.rb
index e8946f17e7d2b85d65ef2985c5d8a62804a081a1..8deb1dfda780879315940c5d127b3be524105c05 100644 (file)
--- a/roles/altavoz.rb
+++ b/roles/altavoz.rb
@@ -8,12 +8,7 @@ default_attributes(
     :nameservers => [
       "200.91.44.10",
       "200.91.41.10"
-    ],
-    :roles => {
-      :external => {
-        :zone => "av"
-      }
-    }
+    ]
   }
 )
 

diff --git a/roles/aws.rb b/roles/aws.rb
index 5f4ac7ace2b33f5f5e76a63b1a3488ec20adbd24..d4ad3fd0f3aa7e57826a26b564c568bf83070962 100644 (file)
--- a/roles/aws.rb
+++ b/roles/aws.rb
@@ -14,7 +14,6 @@ default_attributes(
         }
       },
       :external => {
-        :zone => "aws",
         :inet => {
           :prefix => "32"
         }

diff --git a/roles/base.rb b/roles/base.rb
index 23b5e4e1a869fe42b3bbe2be3dd324415a42f9e8..ce481861cbee0c5a608385138070aa25d780068d 100644 (file)
--- a/roles/base.rb
+++ b/roles/base.rb
@@ -20,7 +20,7 @@ default_attributes(
   :networking => {
     :roles => {
       :internal => { :metric => 200, :zone => "loc" },
-      :external => { :metric => 100 }
+      :external => { :metric => 100, :zone => "osm" }
     },
     :search => ["openstreetmap.org"]
   },

diff --git a/roles/blix.rb b/roles/blix.rb
index 835da71c93169bec8cc71cfb086d942c18d684d0..f58d760dc113f1ac6bbf8d55db52fbee56aed479 100644 (file)
--- a/roles/blix.rb
+++ b/roles/blix.rb
@@ -9,11 +9,6 @@ default_attributes(
   },
   :hosted_by => "Blix Solutions",
   :networking => {
-    :nameservers => ["8.8.8.8", "8.8.4.4"],
-    :roles => {
-      :external => {
-        :zone => "bx"
-      }
-    }
+    :nameservers => ["8.8.8.8", "8.8.4.4"]
   }
 )

diff --git a/roles/c3sl.rb b/roles/c3sl.rb
index e01f5ed3dd1aa1e561290b22939d4d28d115e443..b44eab9d13f042e82ca472ff150a000260858194 100644 (file)
--- a/roles/c3sl.rb
+++ b/roles/c3sl.rb
@@ -11,12 +11,7 @@ default_attributes(
   :location => "Curitiba, Brazil",
   :timezone => "America/Sao_Paulo",
   :networking => {
-    :nameservers => ["200.17.202.3", "200.236.31.1"],
-    :roles => {
-      :external => {
-        :zone => "osm"
-      }
-    }
+    :nameservers => ["200.17.202.3", "200.236.31.1"]
   }
 )
 

diff --git a/roles/carnet.rb b/roles/carnet.rb
index fab353fa680df20bf02b7c40eb7685e9865867e3..8ed5cb3f64bc602f3e91b02fdbec1b6d33795ba7 100644 (file)
--- a/roles/carnet.rb
+++ b/roles/carnet.rb
@@ -7,14 +7,7 @@ default_attributes(
       :hbogner => { :status => :administrator }
     }
   },
-  :hosted_by => "CARNet",
-  :networking => {
-    :roles => {
-      :external => {
-        :zone => "cnt"
-      }
-    }
-  }
+  :hosted_by => "CARNet"
 )
 
 override_attributes(

diff --git a/roles/catalyst.rb b/roles/catalyst.rb
index f5101a24f4de86c50c8c68ff4e82d71131c8d4b9..44319813f7f5b0a46f92365b01a25ceb097c1f0a 100644 (file)
--- a/roles/catalyst.rb
+++ b/roles/catalyst.rb
@@ -5,12 +5,7 @@ default_attributes(
   :hosted_by => "Catalyst",
   :location => "Hamilton, New Zealand",
   :networking => {
-    :nameservers => ["202.78.244.85", "202.78.244.86", "202.78.244.87"],
-    :roles => {
-      :external => {
-        :zone => "osm"
-      }
-    }
+    :nameservers => ["202.78.244.85", "202.78.244.86", "202.78.244.87"]
   }
 )
 

diff --git a/roles/datahata.rb b/roles/datahata.rb
index 650c8a7fe5e09ebe76f4748b7a435e8a693f2f2c..42b3d40f7d821bcc442cc879b4202b5fc2e59c06 100644 (file)
--- a/roles/datahata.rb
+++ b/roles/datahata.rb
@@ -14,12 +14,7 @@ default_attributes(
       "31.130.200.2",
       "8.8.8.8",
       "8.8.4.4"
-    ],
-    :roles => {
-      :external => {
-        :zone => "dh"
-      }
-    }
+    ]
   }
 )
 

diff --git a/roles/delta.rb b/roles/delta.rb
index 109c9340c940b9714db3b54893e7899f12c39fcd..bf307528ab2fc8d85aae9782c9362a5abe2418d9 100644 (file)
--- a/roles/delta.rb
+++ b/roles/delta.rb
@@ -5,12 +5,7 @@ default_attributes(
   :hosted_by => "Delta Telecom",
   :location => "Baku, Azerbaijan",
   :networking => {
-    :nameservers => ["94.20.20.20", "8.8.8.8", "8.8.4.4"],
-    :roles => {
-      :external => {
-        :zone => "dt"
-      }
-    }
+    :nameservers => ["94.20.20.20", "8.8.8.8", "8.8.4.4"]
   }
 )
 

diff --git a/roles/dotsrc.rb b/roles/dotsrc.rb
index e236f27569e67a0335e409cbf30d2e876bcfe3c8..21838b72d6019e7f9a15eca7bb976793378b3d64 100644 (file)
--- a/roles/dotsrc.rb
+++ b/roles/dotsrc.rb
@@ -9,12 +9,7 @@ default_attributes(
       "130.226.1.2",
       "130.226.255.53",
       "2001:878:0:100::2"
-    ],
-    :roles => {
-      :external => {
-        :zone => "ds"
-      }
-    }
+    ]
   }
 )
 

diff --git a/roles/edgeuno.rb b/roles/edgeuno.rb
index a11b1af865fa2bd5d5e156e1435adf097c730d3e..c1224f2bab0c14394884082a679553599b286679 100644 (file)
--- a/roles/edgeuno.rb
+++ b/roles/edgeuno.rb
@@ -36,11 +36,6 @@ default_attributes(
     :nameservers => [
       "8.8.8.8",
       "1.1.1.1"
-    ],
-    :roles => {
-      :external => {
-        :zone => "osm"
-      }
-    }
+    ]
   }
 )

diff --git a/roles/euserv.rb b/roles/euserv.rb
index 8a2de049a6c6d2e602c8e292839c84547e2715bf..ec354bfe22c81a468e67b5d097390c94be68ab81 100644 (file)
--- a/roles/euserv.rb
+++ b/roles/euserv.rb
@@ -7,12 +7,7 @@ default_attributes(
   :networking => {
     :nameservers => [
       "85.31.184.60", "85.31.184.61", "85.31.185.60", "85.31.185.61"
-    ],
-    :roles => {
-      :external => {
-        :zone => "es"
-      }
-    }
+    ]
   }
 )
 

diff --git a/roles/exonetric.rb b/roles/exonetric.rb
index ea1c0048161a117b6c24acebef058947cd16ddf3..b03aa8c7150267432617f926423f1b9f73e15846 100644 (file)
--- a/roles/exonetric.rb
+++ b/roles/exonetric.rb
@@ -13,7 +13,6 @@ default_attributes(
     :nameservers => ["8.8.8.8", "8.8.4.4"],
     :roles => {
       :external => {
-        :zone => "ex",
         :inet => {
           :prefix => "28",
           :gateway => "178.250.74.33"

diff --git a/roles/faimaison.rb b/roles/faimaison.rb
index 2a87de1605f3b5b98134928382f1c1362bc72d8f..a72fff50bd0722d4b22f0b7182de3db6ed8b7ee1 100644 (file)
--- a/roles/faimaison.rb
+++ b/roles/faimaison.rb
@@ -9,12 +9,7 @@ default_attributes(
       "8.8.8.8",
       "8.8.4.4",
       "1.1.1.1"
-    ],
-    :roles => {
-      :external => {
-        :zone => "osm"
-      }
-    }
+    ]
   }
 )
 

diff --git a/roles/ffrl.rb b/roles/ffrl.rb
index 7858e1b59b41e4bf6031154342064a7da386d0a3..35599a01c370a6714f1a229649ca1dacfada8024 100644 (file)
--- a/roles/ffrl.rb
+++ b/roles/ffrl.rb
@@ -8,12 +8,7 @@ default_attributes(
     :nameservers => [
       "8.8.8.8",
       "8.8.4.4"
-    ],
-    :roles => {
-      :external => {
-        :zone => "ffr"
-      }
-    }
+    ]
   }
 )
 

diff --git a/roles/firefishynet.rb b/roles/firefishynet.rb
index 58f78d3326727d0b7a5cbfa4c5271e36c9387e54..fca212ad858970b96d7899ebe802f26d7c3c19d2 100644 (file)
--- a/roles/firefishynet.rb
+++ b/roles/firefishynet.rb
@@ -10,9 +10,6 @@ default_attributes(
           :prefix => "24",
           :gateway => "10.89.121.1"
         }
-      },
-      :external => {
-        :zone => "ff"
       }
     }
   }

diff --git a/roles/g5solutions.rb b/roles/g5solutions.rb
index 5cb41ec5dfb79230197b600edea2d97de8d0e1cd..96aaa883bbbba9551d33471e77c1197822410f5d 100644 (file)
--- a/roles/g5solutions.rb
+++ b/roles/g5solutions.rb
@@ -13,12 +13,7 @@ default_attributes(
     :nameservers => [
       "8.8.8.8",
       "8.8.4.4"
-    ],
-    :roles => {
-      :external => {
-        :zone => "g5s"
-      }
-    }
+    ]
   }
 )
 

diff --git a/roles/gandi.rb b/roles/gandi.rb
index 6868a7c61545ecb0602afa1262c9be023442223d..d1a332a156ac7b7c3a2c282ae2e540df0e9ad7d8 100644 (file)
--- a/roles/gandi.rb
+++ b/roles/gandi.rb
@@ -9,12 +9,7 @@ default_attributes(
       "217.70.186.194",
       "217.70.186.193",
       "2001:4b98:dc2:49::193"
-    ],
-    :roles => {
-      :external => {
-        :zone => "osm"
-      }
-    }
+    ]
   }
 )
 

diff --git a/roles/grifon.rb b/roles/grifon.rb
index 054af06f1a686a5a6ef3b6ce0d0b4a5ddda43134..c9653f93d0aa2346b88419fd08a13dd573ef2bef 100644 (file)
--- a/roles/grifon.rb
+++ b/roles/grifon.rb
@@ -29,12 +29,7 @@ default_attributes(
         }
       ]
     },
-    :nameservers => ["2a00:5884::7", "8.8.8.8", "8.8.4.4"],
-    :roles => {
-      :external => {
-        :zone => "grf"
-      }
-    }
+    :nameservers => ["2a00:5884::7", "8.8.8.8", "8.8.4.4"]
   }
 )
 

diff --git a/roles/grnet.rb b/roles/grnet.rb
index 6893b6592088f95765cf728cfdf22dacb1217051..1ca197be51c1ab938d015daff3ee059f6354943e 100644 (file)
--- a/roles/grnet.rb
+++ b/roles/grnet.rb
@@ -13,12 +13,7 @@ default_attributes(
     :nameservers => [
       "8.8.8.8",
       "8.8.4.4"
-    ],
-    :roles => {
-      :external => {
-        :zone => "grn"
-      }
-    }
+    ]
   }
 )
 

diff --git a/roles/hetzner.rb b/roles/hetzner.rb
index 4ed08654daa0a19776575884b7008f9b8f6c0832..20d855f656ab9fe5c80e59c709f352196ee0c0da 100644 (file)
--- a/roles/hetzner.rb
+++ b/roles/hetzner.rb
@@ -11,12 +11,7 @@ default_attributes(
       "2a01:4f8:0:a111::add:9898",
       "2a01:4f8:0:a102::add:9999",
       "2a01:4f8:0:a0a1::add:1010"
-    ],
-    :roles => {
-      :external => {
-        :zone => "hz"
-      }
-    }
+    ]
   }
 )
 

diff --git a/roles/hostedinnz.rb b/roles/hostedinnz.rb
index d8f0311b1ac8d73dda2778cc8996b089ce36dd9e..7e0944309c82525cd5331e75d3cf8a5a08bf046c 100644 (file)
--- a/roles/hostedinnz.rb
+++ b/roles/hostedinnz.rb
@@ -10,12 +10,7 @@ default_attributes(
   :hosted_by => "HostedIn.NZ",
   :location => "Wellington, New Zealand",
   :networking => {
-    :nameservers => ["8.8.8.8", "8.8.4.4"],
-    :roles => {
-      :external => {
-        :zone => "osm"
-      }
-    }
+    :nameservers => ["8.8.8.8", "8.8.4.4"]
   },
   :snmpd => {
     :clients => ["103.106.66.28"],

diff --git a/roles/inxza.rb b/roles/inxza.rb
index 03d5ff70e4cb998a02c4e661637a4120b7bcc6d1..aa80ea347f8b88c765964f3b2dfbad1920451f34 100644 (file)
--- a/roles/inxza.rb
+++ b/roles/inxza.rb
@@ -9,12 +9,7 @@ default_attributes(
       "196.10.52.52",
       "196.10.54.54",
       "196.10.55.55"
-    ],
-    :roles => {
-      :external => {
-        :zone => "ixz"
-      }
-    }
+    ]
   }
 )
 

diff --git a/roles/iway.rb b/roles/iway.rb
index b734f2eea022aeed11b4576ea1b95471e6bec9b9..3a4c1b888203001e401855ae611093a91b7eaa45 100644 (file)
--- a/roles/iway.rb
+++ b/roles/iway.rb
@@ -24,12 +24,7 @@ default_attributes(
         }
       ]
     },
-    :nameservers => ["2001:8e0:ffff:ac1::1", "8.8.8.8", "8.8.4.4"],
-    :roles => {
-      :external => {
-        :zone => "osm"
-      }
-    }
+    :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 9a026f370f542bdf3b93c40db77334bd5011c79b..4186ecc4cdd7fe97d48bb9f4ac90096f4f1c8c82 100644 (file)
--- a/roles/jump.rb
+++ b/roles/jump.rb
@@ -10,12 +10,7 @@ default_attributes(
       "2001:ba8:0:2c02::",
       "2001:ba8:0:2c03::",
       "2001:ba8:0:2c04::"
-    ],
-    :roles => {
-      :external => {
-        :zone => "jn"
-      }
-    }
+    ]
   }
 )
 

diff --git a/roles/lyonix.rb b/roles/lyonix.rb
index a5aff59e0b33853778abbada6fe3fce94d3ef8d7..faf838dac0bbbf67a35890f03fff80064ddc879f 100644 (file)
--- a/roles/lyonix.rb
+++ b/roles/lyonix.rb
@@ -5,12 +5,7 @@ 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"],
-    :roles => {
-      :external => {
-        :zone => "ly"
-      }
-    }
+    :nameservers => ["77.95.64.205", "77.95.64.206", "8.8.8.8", "8.8.4.4"]
   },
   :snmpd => {
     :clients => ["77.95.64.0/24", "77.95.70.0/24"],

diff --git a/roles/lysator.rb b/roles/lysator.rb
index 22f34ea5273cf744611118e341601c47ad33ec82..7bf25dc165725959f59a1db4ef315da9f4661904 100644 (file)
--- a/roles/lysator.rb
+++ b/roles/lysator.rb
@@ -11,12 +11,7 @@ default_attributes(
   :hosted_by => "Lysator",
   :location => "Linköping, Sweden",
   :networking => {
-    :nameservers => ["130.236.254.225", "2001:6b0:17:f0a0::e1", "130.236.254.4"],
-    :roles => {
-      :external => {
-        :zone => "osm"
-      }
-    }
+    :nameservers => ["130.236.254.225", "2001:6b0:17:f0a0::e1", "130.236.254.4"]
   }
 )
 

diff --git a/roles/milkywan.rb b/roles/milkywan.rb
index d84cf531945097c7ae8b5fbf91b07b8c8963228e..7f75a2edc2298d84d0edba8fcd6224f0a364293e 100644 (file)
--- a/roles/milkywan.rb
+++ b/roles/milkywan.rb
@@ -24,12 +24,7 @@ default_attributes(
         }
       ]
     },
-    :nameservers => ["130.117.11.11", "2a0b:cbc0:42::42"],
-    :roles => {
-      :external => {
-        :zone => "osm"
-      }
-    }
+    :nameservers => ["130.117.11.11", "2a0b:cbc0:42::42"]
   }
 )
 

diff --git a/roles/nchc.rb b/roles/nchc.rb
index 58b3ed500b05a2265199d9b61675bf63a8ec1181..9af0b8af1b8d98e3507b38089515a742630cd85f 100644 (file)
--- a/roles/nchc.rb
+++ b/roles/nchc.rb
@@ -11,12 +11,7 @@ default_attributes(
   :hosted_by => "NCHC",
   :location => "Hsinchu, Taiwan",
   :networking => {
-    :nameservers => ["140.110.16.1", "140.110.4.1"],
-    :roles => {
-      :external => {
-        :zone => "nc"
-      }
-    }
+    :nameservers => ["140.110.16.1", "140.110.4.1"]
   }
 )
 

diff --git a/roles/netalerts.rb b/roles/netalerts.rb
index aaabe14e7cc6b697e694b736c9c49833e8955f46..85e6824d4b7b5057c67007b16b6b02ba6fba3181 100644 (file)
--- a/roles/netalerts.rb
+++ b/roles/netalerts.rb
@@ -9,12 +9,7 @@ default_attributes(
     :nameservers => [
       "209.172.41.202",
       "209.172.41.200"
-    ],
-    :roles => {
-      :external => {
-        :zone => "na"
-      }
-    }
+    ]
   }
 )
 

diff --git a/roles/osuosl.rb b/roles/osuosl.rb
index f80b1177a2fae2f824922a527ee91f17f08e3ac0..489152a0289d50cf9e7343349b1f06c7c77403ae 100644 (file)
--- a/roles/osuosl.rb
+++ b/roles/osuosl.rb
@@ -14,7 +14,6 @@ default_attributes(
     :nameservers => ["8.8.8.8", "8.8.4.4"],
     :roles => {
       :external => {
-        :zone => "ool",
         :inet => {
           :prefix => "28",
           :gateway => "140.211.167.97"

diff --git a/roles/ovh.rb b/roles/ovh.rb
index 506be9c9a14ef5a8c2c211e6de9eb7317738cf9d..9a0e9d561c705f6e130d6177f34668b57801f3e0 100644 (file)
--- a/roles/ovh.rb
+++ b/roles/ovh.rb
@@ -7,12 +7,7 @@ default_attributes(
   :networking => {
     :nameservers => [
       "213.186.33.99"
-    ],
-    :roles => {
-      :external => {
-        :zone => "ovh"
-      }
-    }
+    ]
   }
 )
 

diff --git a/roles/paulla.rb b/roles/paulla.rb
index b84b86c96ca6d91f046a5e84b423b2f604b8d16a..27149d2472763bacb929d59d026e9869f2186f50 100644 (file)
--- a/roles/paulla.rb
+++ b/roles/paulla.rb
@@ -14,12 +14,7 @@ default_attributes(
     :allow => ["10.64.1.11"]
   },
   :networking => {
-    :nameservers => ["10.64.1.42", "194.167.156.13", "10.64.1.3"],
-    :roles => {
-      :external => {
-        :zone => "pa"
-      }
-    }
+    :nameservers => ["10.64.1.42", "194.167.156.13", "10.64.1.3"]
   }
 )
 

diff --git a/roles/prgmr.rb b/roles/prgmr.rb
index 1477757089848ae76e8edadd549c435e416ad58b..918481423daeb1cd0e4e97b4f5ca534ea836da04 100644 (file)
--- a/roles/prgmr.rb
+++ b/roles/prgmr.rb
@@ -6,12 +6,7 @@ default_attributes(
   :location => "San Francisco, California",
   :timezone => "PST8PDT",
   :networking => {
-    :nameservers => ["8.8.8.8", "8.8.4.4"],
-    :roles => {
-      :external => {
-        :zone => "pr"
-      }
-    }
+    :nameservers => ["8.8.8.8", "8.8.4.4"]
   }
 )
 

diff --git a/roles/scaleway.rb b/roles/scaleway.rb
index 996bb0e46a14dc9b1c4b8f3d455bf83cfd5c6401..b7daaa0fb5bea60efe504bdd54eb9aa0da9639c5 100644 (file)
--- a/roles/scaleway.rb
+++ b/roles/scaleway.rb
@@ -8,12 +8,7 @@ default_attributes(
     :nameservers => [
       "62.210.16.6",
       "62.210.16.7"
-    ],
-    :roles => {
-      :external => {
-        :zone => "osm"
-      }
-    }
+    ]
   }
 )
 

diff --git a/roles/strato.rb b/roles/strato.rb
index 75793178b75dc4c569f1e418c3445b200bd4011c..05ed336ccbe11cf4990318eda4468a998445bd49 100644 (file)
--- a/roles/strato.rb
+++ b/roles/strato.rb
@@ -8,12 +8,7 @@ default_attributes(
     :nameservers => [
       "85.214.7.22",
       "81.169.163.106"
-    ],
-    :roles => {
-      :external => {
-        :zone => "osm"
-      }
-    }
+    ]
   }
 )
 

diff --git a/roles/szerverem.rb b/roles/szerverem.rb
index 137600f4e3559e2f7b273c5cdd7b04ced183ae2f..45ac8108ecf02d4534be5903272491efc244fe26 100644 (file)
--- a/roles/szerverem.rb
+++ b/roles/szerverem.rb
@@ -8,12 +8,7 @@ default_attributes(
     :nameservers => [
       "8.8.8.8",
       "8.8.4.4"
-    ],
-    :roles => {
-      :external => {
-        :zone => "sz"
-      }
-    }
+    ]
   }
 )
 

diff --git a/roles/teleservice.rb b/roles/teleservice.rb
index ea2dece10828260223a330d063bfedc0f3723829..7602c30c1cf525515b991fb401ffd720df02a3d8 100644 (file)
--- a/roles/teleservice.rb
+++ b/roles/teleservice.rb
@@ -5,12 +5,7 @@ default_attributes(
   :hosted_by => "Teleservice Skåne AB",
   :location => "Sjöbo, Sweden",
   :networking => {
-    :nameservers => ["8.8.8.8", "8.8.4.4"],
-    :roles => {
-      :external => {
-        :zone => "ts"
-      }
-    }
+    :nameservers => ["8.8.8.8", "8.8.4.4"]
   }
 )
 

diff --git a/roles/teraswitch.rb b/roles/teraswitch.rb
index 6cede96e4573382b8d1dd902eeb63e7f90a278d5..1c24a529b68f267880bb7894a015fdb672620e0e 100644 (file)
--- a/roles/teraswitch.rb
+++ b/roles/teraswitch.rb
@@ -14,12 +14,7 @@ default_attributes(
     :nameservers => [
       "1.1.1.1",
       "8.8.8.8"
-    ],
-    :roles => {
-      :external => {
-        :zone => "osm"
-      }
-    }
+    ]
   }
 )
 

diff --git a/roles/tetaneutral.rb b/roles/tetaneutral.rb
index 07a26768e11b65f4118c3223db2d41657e760778..2459652ba34c8ec45052e1a1b26de4642a08b057 100644 (file)
--- a/roles/tetaneutral.rb
+++ b/roles/tetaneutral.rb
@@ -13,12 +13,7 @@ default_attributes(
     :nameservers => [
       "8.8.8.8",
       "8.8.4.4"
-    ],
-    :roles => {
-      :external => {
-        :zone => "tnn"
-      }
-    }
+    ]
   }
 )
 

diff --git a/roles/tuxis.rb b/roles/tuxis.rb
index 5cde762df7d8f73a3770d04ea931fec9d3c3fd6f..3b4a8acbe2fab9725fec07ec401b2efd71d8d449 100644 (file)
--- a/roles/tuxis.rb
+++ b/roles/tuxis.rb
@@ -5,12 +5,7 @@ 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"],
-    :roles => {
-      :external => {
-        :zone => "osm"
-      }
-    }
+    :nameservers => ["2a03:7900:2:0:31:3:104:61", "2a03:7900:2:0:31:3:104:62"]
   }
 )
 

diff --git a/roles/umu.rb b/roles/umu.rb
index 70c88a25313364e3f3c82054361b81920f7bfd72..33caf6148fdbce296068ead39ca1aa7b161b8d7a 100644 (file)
--- a/roles/umu.rb
+++ b/roles/umu.rb
@@ -10,12 +10,7 @@ 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"],
-    :roles => {
-      :external => {
-        :zone => "osm"
-      }
-    }
+    :nameservers => ["130.239.18.251", "130.239.18.252", "130.239.1.90"]
   }
 )
 

diff --git a/roles/unizar.rb b/roles/unizar.rb
index f9d5d12377e1d92f9eb4034886ccb0e51f8c181e..746edaf8889f4cfac1801c42c294b82d96dad98f 100644 (file)
--- a/roles/unizar.rb
+++ b/roles/unizar.rb
@@ -10,12 +10,7 @@ default_attributes(
   :hosted_by => "University of Zaragoza",
   :location => "Zaragoza, Spain",
   :networking => {
-    :nameservers => ["155.210.12.9", "155.210.3.12"],
-    :roles => {
-      :external => {
-        :zone => "uz"
-      }
-    }
+    :nameservers => ["155.210.12.9", "155.210.3.12"]
   }
 )
 

diff --git a/roles/utelecom.rb b/roles/utelecom.rb
index d4aca4c0ed383681c3765f2e30d7c5ff2be2044d..7f613872ecdadca7ec6cc27ddab5eb952a11b7ad 100644 (file)
--- a/roles/utelecom.rb
+++ b/roles/utelecom.rb
@@ -5,12 +5,7 @@ default_attributes(
   :hosted_by => "Ukrainian Telecommunication Group",
   :location => "Kiev, Ukraine",
   :networking => {
-    :nameservers => ["8.8.8.8", "8.8.4.4"],
-    :roles => {
-      :external => {
-        :zone => "osm"
-      }
-    }
+    :nameservers => ["8.8.8.8", "8.8.4.4"]
   }
 )
 

diff --git a/roles/yandex.rb b/roles/yandex.rb
index 0199950477e58dbd5eef915bc5557b50716c0ec3..780c8face10630758c869b7737479b53a7ceec2c 100644 (file)
--- a/roles/yandex.rb
+++ b/roles/yandex.rb
@@ -6,12 +6,7 @@ default_attributes(
   :location => "Moscow, Russia",
   :timezone => "Europe/Moscow",
   :networking => {
-    :nameservers => ["8.8.8.8", "8.8.4.4"],
-    :roles => {
-      :external => {
-        :zone => "yx"
-      }
-    }
+    :nameservers => ["8.8.8.8", "8.8.4.4"]
   }
 )
 

diff --git a/roles/zcu.rb b/roles/zcu.rb
index b059c5bf1bf63c50c68c106228783898da35e773..cfa1f63fc73a2c7979be2fad61ff5c6500856861 100644 (file)
--- a/roles/zcu.rb
+++ b/roles/zcu.rb
@@ -5,12 +5,7 @@ default_attributes(
   :hosted_by => "University of West Bohemia",
   :location => "Pilsen, Czech Republic",
   :networking => {
-    :nameservers => ["147.228.3.3", "147.228.52.11"],
-    :roles => {
-      :external => {
-        :zone => "osm"
-      }
-    }
+    :nameservers => ["147.228.3.3", "147.228.52.11"]
   }
 )