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

[chef.git] / roles / greenmini.rb

diff --git a/roles/greenmini.rb b/roles/greenmini.rb
index 16f7974d5431dea3c26a2669910e373fe2c284c8..2156eb3325199ca3701302c781c4c14de8bc16b1 100644 (file)
--- a/roles/greenmini.rb
+++ b/roles/greenmini.rb
@@ -8,18 +8,13 @@ default_attributes(
     }
   },
   :hosted_by => "greenminihost",
-  :location => "Dronten, Netherlands",
-  :networking => {
-    :nameservers => [
-      "45.148.169.130",
-      "185.200.102.102",
-      "2a0a:aa42:222:2500::2500",
-      "2a0a:aa42:321:2000::53"
-    ]
-  }
+  :location => "Dronten, Netherlands"
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["45.148.169.130", "185.200.102.102", "2a0a:aa42:222:2500::2500", "2a0a:aa42:321:2000::53"]
+  },
   :ntp => {
     :servers => ["0.nl.pool.ntp.org", "1.nl.pool.ntp.org", "europe.pool.ntp.org"]
   }