X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/67c4970880bf20f42452c57c820b5b8ecaa63862..15c5f64e3607c5d84383af0f8a08137f3fb8a9f6:/roles/ascalon.rb

diff --git a/roles/ascalon.rb b/roles/ascalon.rb
index 49eb0bd34..b00e22c5f 100644
--- a/roles/ascalon.rb
+++ b/roles/ascalon.rb
@@ -4,32 +4,19 @@ description "Master role applied to ascalon"
 default_attributes(
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
-        :interface => "eth0",
+      :external => {
+        :interface => "eno1",
         :role => :external,
-        :family => :inet,
-        :address => "184.107.48.228",
-        :prefix => "27",
-        :gateway => "184.107.48.225"
+        :inet => {
+          :address => "184.107.48.228",
+          :prefix => "27",
+          :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=150 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]"
 )