Merge remote-tracking branch 'tigerfell/pr257'

[chef.git] / roles / drogon.rb

diff --git a/roles/drogon.rb b/roles/drogon.rb
index 8408eb11b1b8a395e7b9e0961196654e43b9aafb..2152356dca3ebadbe3441f6436582d3aea53904f 100644 (file)
--- a/roles/drogon.rb
+++ b/roles/drogon.rb
@@ -7,6 +7,7 @@ default_attributes(
       :zelja => { :status => :administrator }
     }
   },
+  :location => "Osijek, Croatia",
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -25,25 +26,10 @@ default_attributes(
         :prefix => "64",
         :gateway => "fe80::161:53:30:97"
       }
-    },
-    :nameservers => [
-      "161.53.30.100",
-      "8.8.8.8"
-    ]
-  },
-  :squid => {
-    :cache_mem => "6000 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :tilecache => {
-    :tile_parent => "pula.render.openstreetmap.org",
-    :tile_siblings => [
-      "viserion.openstreetmap.org"
-    ]
+    }
   }
 )
 
 run_list(
-  "role[carnet]",
-  "role[tilecache]"
+  "role[carnet]"
 )