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

[chef.git] / roles / ovh.rb

diff --git a/roles/ovh.rb b/roles/ovh.rb
index 506be9c9a14ef5a8c2c211e6de9eb7317738cf9d..f8391a2aa941ae1d535850de69e3743c2d13f2e0 100644 (file)
--- a/roles/ovh.rb
+++ b/roles/ovh.rb
@@ -3,20 +3,13 @@ description "Role applied to all servers at OVH"
 
 default_attributes(
   :hosted_by => "OVH",
-  :location => "Roubaix, France",
-  :networking => {
-    :nameservers => [
-      "213.186.33.99"
-    ],
-    :roles => {
-      :external => {
-        :zone => "ovh"
-      }
-    }
-  }
+  :location => "Roubaix, France"
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["213.186.33.99"]
+  },
   :ntp => {
     :servers => ["0.fr.pool.ntp.org", "1.fr.pool.ntp.org", "europe.pool.ntp.org"]
   }