Revert "Remove some redundant settings from chef server configuration"

[chef.git] / roles / netalerts.rb

diff --git a/roles/netalerts.rb b/roles/netalerts.rb
index 6f401ecc5e940c2db1345fdd0a68ef2e216cb022..bbccac112d7d9ea9a1147699b490bd932e426620 100644 (file)
--- a/roles/netalerts.rb
+++ b/roles/netalerts.rb
@@ -4,22 +4,15 @@ description "Role applied to all servers at NetAlerts"
 default_attributes(
   :hosted_by => "NetAlerts",
   :location => "Montréal, Canada",
-  :networking => {
-    :nameservers => [
-      "209.172.41.202",
-      "209.172.41.200"
-    ],
-    :roles => {
-      :external => {
-        :zone => "na"
-      }
-    }
-  }
+  :timezone => "America/Montreal"
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["209.172.41.202", "209.172.41.200"]
+  },
   :ntp => {
-    :servers => ["0.ca.pool.ntp.org", "1.ca.pool.ntp.org", "america.pool.ntp.org"]
+    :servers => ["0.ca.pool.ntp.org", "1.ca.pool.ntp.org", "north-america.pool.ntp.org"]
   }
 )