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

[chef.git] / roles / strato.rb

diff --git a/roles/strato.rb b/roles/strato.rb
index 75793178b75dc4c569f1e418c3445b200bd4011c..5cf4445dcf2505798059676e5b855f4154f60a81 100644 (file)
--- a/roles/strato.rb
+++ b/roles/strato.rb
@@ -3,21 +3,13 @@ description "Role applied to all servers at Strato"
 
 default_attributes(
   :hosted_by => "Strato",
 
 default_attributes(
   :hosted_by => "Strato",

-  :location => "Germany",
-  :networking => {
-    :nameservers => [
-      "85.214.7.22",
-      "81.169.163.106"
-    ],
-    :roles => {
-      :external => {
-        :zone => "osm"
-      }
-    }
-  }
+  :location => "Germany"

 )
 
 override_attributes(
 )
 
 override_attributes(

+  :networking => {
+    :nameservers => ["85.214.7.22", "81.169.163.106"]
+  },

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