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

[chef.git] / roles / netalerts.rb

diff --git a/roles/netalerts.rb b/roles/netalerts.rb
index 85e6824d4b7b5057c67007b16b6b02ba6fba3181..bbccac112d7d9ea9a1147699b490bd932e426620 100644 (file)
--- a/roles/netalerts.rb
+++ b/roles/netalerts.rb
@@ -4,16 +4,13 @@ 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"
-    ]
-  }
+  :timezone => "America/Montreal"

 )
 
 override_attributes(
 )
 
 override_attributes(

+  :networking => {
+    :nameservers => ["209.172.41.202", "209.172.41.200"]
+  },

   :ntp => {
     :servers => ["0.ca.pool.ntp.org", "1.ca.pool.ntp.org", "north-america.pool.ntp.org"]
   }
   :ntp => {
     :servers => ["0.ca.pool.ntp.org", "1.ca.pool.ntp.org", "north-america.pool.ntp.org"]
   }