geodns: enable include_optional_ns to please picky DNS servers

[chef.git] / roles / netalerts.rb

diff --git a/roles/netalerts.rb b/roles/netalerts.rb
index 6f401ecc5e940c2db1345fdd0a68ef2e216cb022..85e6824d4b7b5057c67007b16b6b02ba6fba3181 100644 (file)
--- a/roles/netalerts.rb
+++ b/roles/netalerts.rb
@@ -4,22 +4,18 @@ description "Role applied to all servers at NetAlerts"
 default_attributes(
   :hosted_by => "NetAlerts",
   :location => "Montréal, Canada",
 default_attributes(
   :hosted_by => "NetAlerts",
   :location => "Montréal, Canada",

+  :timezone => "America/Montreal",

   :networking => {
     :nameservers => [
       "209.172.41.202",
       "209.172.41.200"
   :networking => {
     :nameservers => [
       "209.172.41.202",
       "209.172.41.200"

-    ],
-    :roles => {
-      :external => {
-        :zone => "na"
-      }
-    }
+    ]

   }
 )
 
 override_attributes(
   :ntp => {
   }
 )
 
 override_attributes(
   :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"]

   }
 )
 
   }
 )