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

[chef.git] / roles / inxza.rb

diff --git a/roles/inxza.rb b/roles/inxza.rb
index 03d5ff70e4cb998a02c4e661637a4120b7bcc6d1..96dd61a960a9584fd929d78ba91fb03d9cb77922 100644 (file)
--- a/roles/inxza.rb
+++ b/roles/inxza.rb
@@ -3,22 +3,13 @@ description "Role applied to all servers at INX-ZA"
 
 default_attributes(
   :hosted_by => "INX-ZA",
 
 default_attributes(
   :hosted_by => "INX-ZA",

-  :location => "Cape Town, South Africa",
-  :networking => {
-    :nameservers => [
-      "196.10.52.52",
-      "196.10.54.54",
-      "196.10.55.55"
-    ],
-    :roles => {
-      :external => {
-        :zone => "ixz"
-      }
-    }
-  }
+  :location => "Cape Town, South Africa"

 )
 
 override_attributes(
 )
 
 override_attributes(

+  :networking => {
+    :nameservers => ["196.10.52.52", "196.10.54.54", "196.10.55.55"]
+  },

   :ntp => {
     :servers => ["0.za.pool.ntp.org", "1.za.pool.ntp.org", "africa.pool.ntp.org"]
   }
   :ntp => {
     :servers => ["0.za.pool.ntp.org", "1.za.pool.ntp.org", "africa.pool.ntp.org"]
   }