Avoid double call to ip2region; consolidate rewrite conditions

[chef.git] / roles / teleservice.rb

diff --git a/roles/teleservice.rb b/roles/teleservice.rb
index 70e0e5bde881a2779a8af726e491520b0465f42e..8704fb679200a9065b8a967e8d95d821bdbe120b 100644 (file)
--- a/roles/teleservice.rb
+++ b/roles/teleservice.rb
@@ -1,18 +1,9 @@
-# coding: utf-8
 name "teleservice"
 description "Role applied to all servers at Teleservice"
 
 default_attributes(
   :hosted_by => "Teleservice Skåne AB",
-  :location => "Sjöbo, Sweden",
-  :networking => {
-    :nameservers => ["8.8.8.8", "8.8.4.4"],
-    :roles => {
-      :external => {
-        :zone => "ts"
-      }
-    }
-  }
+  :location => "Sjöbo, Sweden"
 )
 
 override_attributes(