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

[chef.git] / roles / gandi.rb

diff --git a/roles/gandi.rb b/roles/gandi.rb
index 6868a7c61545ecb0602afa1262c9be023442223d..2fcd1084bbbef5d0e19794b111e2d60771a4e5e6 100644 (file)
--- a/roles/gandi.rb
+++ b/roles/gandi.rb
@@ -3,22 +3,13 @@ description "Role applied to all servers at Gandi"
 
 default_attributes(
   :hosted_by => "Gandi",
-  :location => "Bissen, Luxembourg",
-  :networking => {
-    :nameservers => [
-      "217.70.186.194",
-      "217.70.186.193",
-      "2001:4b98:dc2:49::193"
-    ],
-    :roles => {
-      :external => {
-        :zone => "osm"
-      }
-    }
-  }
+  :location => "Bissen, Luxembourg"
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["217.70.186.194", "217.70.186.193", "2001:4b98:dc2:49::193"]
+  },
   :ntp => {
     :servers => ["0.lu.pool.ntp.org", "1.lu.pool.ntp.org", "europe.pool.ntp.org"]
   }