Add new config setting for taginfo

[chef.git] / roles / euserv.rb

diff --git a/roles/euserv.rb b/roles/euserv.rb
index 7bf9c436314762a4c828dba4eacea42530419b9f..3270de61805064da85da5e71c91f6eb79b9cef35 100644 (file)
--- a/roles/euserv.rb
+++ b/roles/euserv.rb
@@ -2,20 +2,14 @@ name "euserv"
 description "Role applied to all servers at EUserv"
 
 default_attributes(
-  :location => "Jena, Germany",
-  :networking => {
-    :nameservers => [
-      "85.31.184.60", "85.31.184.61", "85.31.185.60", "85.31.185.61"
-    ],
-    :roles => {
-      :external => {
-        :zone => "es"
-      }
-    }
-  }
+  :hosted_by => "EUserv",
+  :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"]
   }