Merge branch 'patch-2' of https://github.com/Tigerfell/chef into pr257

[chef.git] / roles / saphira.rb

diff --git a/roles/saphira.rb b/roles/saphira.rb
index 4e32f12ee294f09f5bbaa9b770f30d83f83fed3e..7da9a071463627441a88edbd8c9b6171110de997 100644 (file)
--- a/roles/saphira.rb
+++ b/roles/saphira.rb
@@ -3,7 +3,6 @@ description "Master role applied to saphira"
 
 default_attributes(
   :networking => {
-    :netplan => true,
     :interfaces => {
       :external_ipv4 => {
         :interface => "eth0",
@@ -22,25 +21,10 @@ default_attributes(
         :gateway => "fe80::fcff:ffff:feff:ffff"
       }
     }
-  },
-  :squid => {
-    :cache_mem => "6100 MB",
-    :cache_dir => "coss /store/squid/coss-01 80000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :tilecache => {
-    :tile_parent => "london.render.openstreetmap.org",
-    :tile_siblings => [
-      "trogdor.openstreetmap.org",
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org",
-      "ridgeback.openstreetmap.org",
-      "gorynych.openstreetmap.org"
-    ]
   }
 )
 
 run_list(
   "role[jump]",
-  "role[geodns]",
-  "role[tilecache]"
+  "role[geodns]"
 )