Merge remote-tracking branch 'github/pull/358' into master

[chef.git] / roles / jump.rb

diff --git a/roles/jump.rb b/roles/jump.rb
index 4f8a3b547417dcc121cc2c88cf5360923d7265bf..eb24ced21e3c60cbd00c91dac8a9780db84316c1 100644 (file)
--- a/roles/jump.rb
+++ b/roles/jump.rb
@@ -2,22 +2,14 @@ name "jump"
 description "Role applied to all servers at Jump Networks"
 
 default_attributes(
 description "Role applied to all servers at Jump Networks"
 
 default_attributes(

-  :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(
 )
 
 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"]
   }
   :ntp => {
     :servers => ["0.uk.pool.ntp.org", "1.uk.pool.ntp.org", "europe.pool.ntp.org"]
   }