Add a comment indicating where imagery blacklist requests come from

[chef.git] / roles / balerion.rb

diff --git a/roles/balerion.rb b/roles/balerion.rb
index 007ecda96de5aa9a1dd803799e7e26f2a5faf96f..cfbc82ec6f6c86c88f01e1f3acf1df7f43f0d9d1 100644 (file)
--- a/roles/balerion.rb
+++ b/roles/balerion.rb
@@ -2,45 +2,56 @@ name "balerion"
 description "Master role applied to balerion"
 
 default_attributes(
 description "Master role applied to balerion"
 
 default_attributes(

-  :hardware => {
-    :shm_size => "36g"
-  },

   :networking => {
     :interfaces => {
   :networking => {
     :interfaces => {

-      :external_ipv4 => {
+      :external => {

         :interface => "bond0",
         :role => :external,
         :interface => "bond0",
         :role => :external,

-        :family => :inet,
-        :address => "138.44.68.134",
-        :prefix => "30",
-        :gateway => "138.44.68.133",
+        :inet => {
+          :address => "138.44.68.134",
+          :prefix => "30",
+          :gateway => "138.44.68.133"
+        },

         :bond => {
         :bond => {

-          :slaves => %w[ens14f0 ens14f1]
+          :slaves => %w[ens14f0np0 ens14f1np1]

         }
       }
     }
   },
         }
       }
     }
   },

-  :squid => {
-    :version => 4,
-    :cache_mem => "32768 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"
-    ]
+  :postgresql => {
+    :settings => {
+      :defaults => {
+        :effective_cache_size => "16GB"
+      }
+    }
+  },
+  :sysctl => {
+    :postgres => {
+      :comment => "Increase shared memory for postgres",
+      :parameters => {
+        "kernel.shmmax" => 9 * 1024 * 1024 * 1024,
+        "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096
+      }
+    }

   },
   },

-  :tilecache => {
-    :tile_parent => "melbourne.render.openstreetmap.org",
-    :tile_siblings => [
-      "waima.openstreetmap.org",
-      "tuatara.openstreetmap.org",
-      "longma.openstreetmap.org"
-    ]
+  :tile => {
+    :database => {
+      :cluster => "14/main",
+      :postgis => "3"
+    },
+    :mapnik => "3.1",
+    :styles => {
+      :default => {
+        :tile_directories => [
+          { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
+        ]
+      }
+    }

   }
 )
 
 run_list(
   "role[aarnet]",
   }
 )
 
 run_list(
   "role[aarnet]",

-  "role[tilecache]"
+  "role[geodns]",
+  "role[tile]"

 )
 )