X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/bb087e9f58eadc96cc644faf7226832efe50cb7b..2d6d56f75a35f748f19411b043b7fc430bdb3c6e:/roles/jump.rb

diff --git a/roles/jump.rb b/roles/jump.rb
index 9d289a671..eb24ced21 100644
--- a/roles/jump.rb
+++ b/roles/jump.rb
@@ -2,23 +2,14 @@ name "jump"
 description "Role applied to all servers at Jump Networks"
 
 default_attributes(
-  :location => "London, England",
-  :networking => {
-    :nameservers => [
-      "185.73.44.3",
-      "2001:ba8:0:2c02::",
-      "2001:ba8:0:2c03::",
-      "2001:ba8:0:2c04::"
-    ],
-    :roles => {
-      :external => {
-        :zone => "jn"
-      }
-    }
-  }
+  :hosted_by => "Jump Networks",
+  :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"]
   }