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

[chef.git] / roles / altavoz.rb

diff --git a/roles/altavoz.rb b/roles/altavoz.rb
index 78f67129589a3730fb831e280976c07a755e940e..ae9d720fc5a2aa9b722a67aa852e70a9cc0434d1 100644 (file)
--- a/roles/altavoz.rb
+++ b/roles/altavoz.rb
@@ -3,23 +3,15 @@ description "Role applied to all servers at AltaVoz"
 
 default_attributes(
   :hosted_by => "AltaVoz",
-  :location => "Viña del Mar, Chile",
-  :networking => {
-    :nameservers => [
-      "200.91.44.10",
-      "200.91.41.10"
-    ],
-    :roles => {
-      :external => {
-        :zone => "av"
-      }
-    }
-  }
+  :location => "Viña del Mar, Chile"
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["200.91.44.10", "200.91.41.10"]
+  },
   :ntp => {
-    :servers => ["0.cl.pool.ntp.org", "1.cl.pool.ntp.org", "america.pool.ntp.org"]
+    :servers => ["0.cl.pool.ntp.org", "1.cl.pool.ntp.org", "south-america.pool.ntp.org"]
   }
 )