Merge remote-tracking branch 'github/pull/516'

[chef.git] / roles / bowser.rb

diff --git a/roles/bowser.rb b/roles/bowser.rb
index e9741785dff163338b2ab4c0298a242d36c80b8a..1789c10966b371d78bd7222191f5985aa8272672 100644 (file)
--- a/roles/bowser.rb
+++ b/roles/bowser.rb
@@ -2,7 +2,6 @@ name "bowser"
 description "Master role applied to bowser"
 
 default_attributes(
 description "Master role applied to bowser"
 
 default_attributes(

-  :location => "Carlton, Victoria, Australia",

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


@@ -11,20 +10,48 @@ default_attributes(
         :family => :inet,
         :address => "138.44.68.106",
         :prefix => "30",
         :family => :inet,
         :address => "138.44.68.106",
         :prefix => "30",

-        :gateway => "138.44.68.106",
-        :mtu => 9000,
+        :gateway => "138.44.68.105",

         :bond => {
         :bond => {

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

         }
       }
         }
       }

+    }
+  },
+  :postgresql => {
+    :settings => {
+      :defaults => {
+        :shared_buffers => "8GB",
+        :maintenance_work_mem => "7144MB",
+        :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
+      }
+    }
+  },
+  :tile => {
+    :database => {
+      :cluster => "14/main",
+      :postgis => "3"

     },
     },

-    :nameservers => [
-      "202.158.207.1",
-      "202.158.207.2"
-    ]
+    :mapnik => "3.1",
+    :styles => {
+      :default => {
+        :tile_directories => [
+          { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
+        ]
+      }
+    }

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[aarnet]"
+  "role[aarnet]",
+  "role[tile]"

 )
 )