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

[chef.git] / roles / ovh.rb

diff --git a/roles/ovh.rb b/roles/ovh.rb
index 0cf210d5ab267f5dc617c8e8cf10dc28b6450774..f8391a2aa941ae1d535850de69e3743c2d13f2e0 100644 (file)
--- a/roles/ovh.rb
+++ b/roles/ovh.rb
@@ -2,12 +2,19 @@ name "ovh"
 description "Role applied to all servers at OVH"
 
 default_attributes(
+  :hosted_by => "OVH",
+  :location => "Roubaix, France"
+)
+
+override_attributes(
   :networking => {
-    :nameservers => ["8.8.4.4", "213.186.33.99", "8.8.8.8"],
-    :roles => {
-      :external => {
-        :zone => "ov"
-      }
-    }
+    :nameservers => ["213.186.33.99"]
+  },
+  :ntp => {
+    :servers => ["0.fr.pool.ntp.org", "1.fr.pool.ntp.org", "europe.pool.ntp.org"]
   }
 )
+
+run_list(
+  "role[fr]"
+)