Revert "Fix bonding options on faffy"

[chef.git] / roles / ascalon.rb

diff --git a/roles/ascalon.rb b/roles/ascalon.rb
index c9749139b78e05fda552c8287e2435dafc36b07b..d7b698e59682accfbf627faec9d5a105524796cb 100644 (file)
--- a/roles/ascalon.rb
+++ b/roles/ascalon.rb
@@ -5,7 +5,7 @@ default_attributes(
   :networking => {
     :interfaces => {
       :external_ipv4 => {
-        :interface => "eth0",
+        :interface => "eno1",
         :role => :external,
         :family => :inet,
         :address => "184.107.48.228",
@@ -13,23 +13,9 @@ default_attributes(
         :gateway => "184.107.48.225"
       }
     }
-  },
-  :squid => {
-    :version => "3",
-    :cache_mem => "16000 MB",
-    :cache_dir => "rock /store/squid/rock-01 128000 swap-timeout=500 max-swap-rate=100 slot-size=4096 max-size=262144"
-  },
-  :tilecache => {
-    :tile_parent => "montreal.render.openstreetmap.org",
-    :tile_siblings => [
-      "stormfly-02.openstreetmap.org",
-      "jakelong.openstreetmap.org"
-    ]
   }
 )
 
 run_list(
-  "role[netalerts]",
-  "role[geodns]",
-  "role[tilecache]"
+  "role[netalerts]"
 )