Merge remote-tracking branch 'github/pull/355' into master

[chef.git] / roles / catalyst.rb

diff --git a/roles/catalyst.rb b/roles/catalyst.rb
index edf3fad82962699e4e3a1393376acc6abf6aa589..413be9ed883a2b1f8832454f9a55dcd1de1cb66d 100644 (file)
--- a/roles/catalyst.rb
+++ b/roles/catalyst.rb
@@ -3,20 +3,15 @@ description "Role applied to all servers at Catalyst"
 
 default_attributes(
   :hosted_by => "Catalyst",
-  :location => "Hamilton, New Zealand",
-  :networking => {
-    :nameservers => ["202.78.244.85", "202.78.244.86", "202.78.244.87"],
-    :roles => {
-      :external => {
-        :zone => "osm"
-      }
-    }
-  }
+  :location => "Hamilton, New Zealand"
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["202.78.244.85", "202.78.244.86", "202.78.244.87"]
+  },
   :ntp => {
-    :servers => ["0.nz.pool.ntp.org", "1.nz.pool.ntp.org", "asia.pool.ntp.org"]
+    :servers => ["0.nz.pool.ntp.org", "1.nz.pool.ntp.org", "oceania.pool.ntp.org"]
   }
 )