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

[chef.git] / roles / scaleway.rb

diff --git a/roles/scaleway.rb b/roles/scaleway.rb
index b7daaa0fb5bea60efe504bdd54eb9aa0da9639c5..26833e17c1d17239ffdbede340885d790967b519 100644 (file)
--- a/roles/scaleway.rb
+++ b/roles/scaleway.rb
@@ -3,16 +3,13 @@ description "Role applied to all servers at Scaleway"
 
 default_attributes(
   :hosted_by => "Scaleway",
 
 default_attributes(
   :hosted_by => "Scaleway",

-  :location => "Paris, France",
-  :networking => {
-    :nameservers => [
-      "62.210.16.6",
-      "62.210.16.7"
-    ]
-  }
+  :location => "Paris, France"

 )
 
 override_attributes(
 )
 
 override_attributes(

+  :networking => {
+    :nameservers => ["62.210.16.6", "62.210.16.7"]
+  },

   :ntp => {
     :servers => ["0.fr.pool.ntp.org", "1.fr.pool.ntp.org", "europe.pool.ntp.org"]
   }
   :ntp => {
     :servers => ["0.fr.pool.ntp.org", "1.fr.pool.ntp.org", "europe.pool.ntp.org"]
   }