Merge remote-tracking branch 'github/pull/451'

[chef.git] / roles / tuxis.rb

diff --git a/roles/tuxis.rb b/roles/tuxis.rb
index 5cde762df7d8f73a3770d04ea931fec9d3c3fd6f..540879da734c0c6ffa529c50c588f85cc1ab9ccf 100644 (file)
--- a/roles/tuxis.rb
+++ b/roles/tuxis.rb
@@ -3,18 +3,13 @@ description "Role applied to all servers at Tuxis"
 
 default_attributes(
   :hosted_by => "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"],
-    :roles => {
-      :external => {
-        :zone => "osm"
-      }
-    }
-  }
+  :location => "Ede, Netherlands"

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