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

[chef.git] / roles / aarnet.rb

diff --git a/roles/aarnet.rb b/roles/aarnet.rb
index 55845b269185da826ba94dae8d9f21798f7efde4..8cab0ea355ed9202539fe48635a22a77c164e0c6 100644 (file)
--- a/roles/aarnet.rb
+++ b/roles/aarnet.rb
@@ -10,13 +10,13 @@ default_attributes(
   },
   :hosted_by => "AARNet",
   :location => "Carlton, Victoria, Australia",
-  :timezone => "Australia/Melbourne",
-  :networking => {
-    :nameservers => ["202.158.207.1", "202.158.207.2"]
-  }
+  :timezone => "Australia/Melbourne"
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["202.158.207.1", "202.158.207.2"]
+  },
   :ntp => {
     :servers => ["0.au.pool.ntp.org", "1.au.pool.ntp.org", "oceania.pool.ntp.org"]
   }