Merge pull request #344 from Firefishy/ignore-vicon-valerus-online-ping

[chef.git] / roles / euserv.rb

diff --git a/roles/euserv.rb b/roles/euserv.rb
index e3731f1441c1b4aeff2a8432bb2103f00daf0bf8..ec354bfe22c81a468e67b5d097390c94be68ab81 100644 (file)
--- a/roles/euserv.rb
+++ b/roles/euserv.rb
@@ -2,21 +2,18 @@ name "euserv"
 description "Role applied to all servers at EUserv"
 
 default_attributes(
 description "Role applied to all servers at EUserv"
 
 default_attributes(

+  :hosted_by => "EUserv",
+  :location => "Jena, Germany",

   :networking => {
     :nameservers => [
       "85.31.184.60", "85.31.184.61", "85.31.185.60", "85.31.185.61"
   :networking => {
     :nameservers => [
       "85.31.184.60", "85.31.184.61", "85.31.185.60", "85.31.185.61"

-    ],
-    :roles => {
-      :external => {
-        :zone => "es"
-      }
-    }
+    ]

   }
 )
 
 override_attributes(
   :ntp => {
   }
 )
 
 override_attributes(
   :ntp => {

-    :servers => [ "0.de.pool.ntp.org", "1.de.pool.ntp.org", "europe.pool.ntp.org" ]
+    :servers => ["0.de.pool.ntp.org", "1.de.pool.ntp.org", "europe.pool.ntp.org"]

   }
 )
 
   }
 )