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

[chef.git] / roles / hetzner.rb

diff --git a/roles/hetzner.rb b/roles/hetzner.rb
index 4ed08654daa0a19776575884b7008f9b8f6c0832..4948c8d6c51d470489be84cf381cbfa8db681d02 100644 (file)
--- a/roles/hetzner.rb
+++ b/roles/hetzner.rb
@@ -2,7 +2,10 @@ name "hetzner"
 description "Role applied to all servers at Hetzner"
 
 default_attributes(
 description "Role applied to all servers at Hetzner"
 
 default_attributes(

-  :hosted_by => "Hetzner",
+  :hosted_by => "Hetzner"
+)
+
+override_attributes(

   :networking => {
     :nameservers => [
       "213.133.98.98",
   :networking => {
     :nameservers => [
       "213.133.98.98",


@@ -11,16 +14,8 @@ default_attributes(
       "2a01:4f8:0:a111::add:9898",
       "2a01:4f8:0:a102::add:9999",
       "2a01:4f8:0:a0a1::add:1010"
       "2a01:4f8:0:a111::add:9898",
       "2a01:4f8:0:a102::add:9999",
       "2a01:4f8:0:a0a1::add:1010"

-    ],
-    :roles => {
-      :external => {
-        :zone => "hz"
-      }
-    }
-  }
-)
-
-override_attributes(
+    ]
+  },

   :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"]
   }