Merge remote-tracking branch 'github/pull/358' into master

[chef.git] / roles / idris.rb

diff --git a/roles/idris.rb b/roles/idris.rb
index 374d1295e539d5aacde24fd9066ef38624ee8ef1..4308c95ab269670a0824565ddc52b273e2cb3448 100644 (file)
--- a/roles/idris.rb
+++ b/roles/idris.rb
@@ -3,7 +3,7 @@ description "Master role applied to idris"
 
 default_attributes(
   :hardware => {
 
 default_attributes(
   :hardware => {

-    :shm_size => "10g"
+    :shm_size => "12g"

   },
   :networking => {
     :interfaces => {
   },
   :networking => {
     :interfaces => {


@@ -11,7 +11,7 @@ default_attributes(
         :interface => "ens160",
         :role => :external,
         :family => :inet,
         :interface => "ens160",
         :role => :external,
         :family => :inet,

-        :address => "200.25.60.195",
+        :address => "200.25.60.197",

         :prefix => "27",
         :gateway => "200.25.60.193"
       },
         :prefix => "27",
         :gateway => "200.25.60.193"
       },


@@ -23,17 +23,21 @@ default_attributes(
         :prefix => "123",
         :gateway => "2800:1e0:1030::61"
       }
         :prefix => "123",
         :gateway => "2800:1e0:1030::61"
       }

+    },
+    :wireguard => {
+      :enabled => false

     }
   },
   :squid => {
     :version => 4,
     }
   },
   :squid => {
     :version => 4,

-    :cache_mem => "16384 MB",
+    :cache_mem => "8192 MB",

     :cache_dir => [
       "rock /store/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996",
       "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
       "rock /store/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
       "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
     :cache_dir => [
       "rock /store/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996",
       "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
       "rock /store/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
       "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"

-    ]
+    ],
+    :private_devices => false

   },
   :nginx => {
     :cache => {
   },
   :nginx => {
     :cache => {


@@ -43,7 +47,7 @@ default_attributes(
     }
   },
   :tilecache => {
     }
   },
   :tilecache => {

-    :tile_parent => "bogota.render.openstreetmap.org"
+    :tile_parent => "buenosaires.render.openstreetmap.org"

   }
 )
 
   }
 )