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

[chef.git] / roles / teleservice.rb

diff --git a/roles/teleservice.rb b/roles/teleservice.rb
index 49f98d4b2a325a981ce0cbbf14c6450d860d12a8..8704fb679200a9065b8a967e8d95d821bdbe120b 100644 (file)
--- a/roles/teleservice.rb
+++ b/roles/teleservice.rb
@@ -2,19 +2,13 @@ name "teleservice"
 description "Role applied to all servers at Teleservice"
 
 default_attributes(
-  :networking => {
-    :nameservers => [ "8.8.8.8", "8.8.4.4" ],
-    :roles => {
-      :external => {
-        :zone => "ts"
-      }
-    }
-  }
+  :hosted_by => "Teleservice Skåne AB",
+  :location => "Sjöbo, Sweden"
 )
 
 override_attributes(
   :ntp => {
-    :servers => [ "0.se.pool.ntp.org", "1.se.pool.ntp.org", "europe.pool.ntp.org" ]
+    :servers => ["0.se.pool.ntp.org", "1.se.pool.ntp.org", "europe.pool.ntp.org"]
   }
 )