Use .ruby-version for local and travis

[chef.git] / roles / ascalon.rb

diff --git a/roles/ascalon.rb b/roles/ascalon.rb
index 49eb0bd345a467ced2b9ad3f7415498f667d6456..1e9a9e4a150f57fe2f8816dd6f385cf3a3d6edc5 100644 (file)
--- a/roles/ascalon.rb
+++ b/roles/ascalon.rb
@@ -5,7 +5,7 @@ default_attributes(
   :networking => {
     :interfaces => {
       :external_ipv4 => {
   :networking => {
     :interfaces => {
       :external_ipv4 => {

-        :interface => "eth0",
+        :interface => "eno1",

         :role => :external,
         :family => :inet,
         :address => "184.107.48.228",
         :role => :external,
         :family => :inet,
         :address => "184.107.48.228",


@@ -15,9 +15,8 @@ default_attributes(
     }
   },
   :squid => {
     }
   },
   :squid => {

-    :version => "3",

     :cache_mem => "16000 MB",
     :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"
+    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"

   },
   :tilecache => {
     :tile_parent => "montreal.render.openstreetmap.org",
   },
   :tilecache => {
     :tile_parent => "montreal.render.openstreetmap.org",