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 1809048d9271ed586d45b028e7e0e8b90161c06b..4948c8d6c51d470489be84cf381cbfa8db681d02 100644 (file)
--- a/roles/hetzner.rb
+++ b/roles/hetzner.rb
@@ -2,26 +2,22 @@ name "hetzner"
 description "Role applied to all servers at Hetzner"
 
 default_attributes(
+  :hosted_by => "Hetzner"
+)
+
+override_attributes(
   :networking => {
     :nameservers => [
       "213.133.98.98",
       "213.133.99.99",
       "213.133.100.100",
-      "[2a01:4f8:0:a111::add:9898]",
-      "[2a01:4f8:0:a102::add:9999]",
-      "[2a01:4f8:0:a0a1::add:1010]"
-    ],
-    :roles => {
-      :external => {
-        :zone => "hz"
-      }
-    }
-  }
-)
-
-override_attributes(
+      "2a01:4f8:0:a111::add:9898",
+      "2a01:4f8:0:a102::add:9999",
+      "2a01:4f8:0:a0a1::add:1010"
+    ]
+  },
   :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"]
   }
 )