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

[chef.git] / roles / bowser.rb

diff --git a/roles/bowser.rb b/roles/bowser.rb
index 9a30ff3cfd6aeff6da68298b9834fbbd2d0a16f6..26e8d2d4f96b4f2525ebefe61c97c7d77222629f 100644 (file)
--- a/roles/bowser.rb
+++ b/roles/bowser.rb
@@ -4,15 +4,16 @@ description "Master role applied to bowser"
 default_attributes(
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
+      :external => {
         :interface => "bond0",
         :role => :external,
-        :family => :inet,
-        :address => "138.44.68.106",
-        :prefix => "30",
-        :gateway => "138.44.68.105",
+        :inet => {
+          :address => "138.44.68.106",
+          :prefix => "30",
+          :gateway => "138.44.68.105"
+        },
         :bond => {
-          :slaves => %w[ens14f0 ens14f1]
+          :slaves => %w[ens14f0np0 ens14f0np1]
         }
       }
     }
@@ -20,8 +21,6 @@ default_attributes(
   :postgresql => {
     :settings => {
       :defaults => {
-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",
         :effective_cache_size => "16GB"
       }
     }
@@ -37,9 +36,10 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "12/main",
+      :cluster => "14/main",
       :postgis => "3"
     },
+    :mapnik => "3.1",
     :styles => {
       :default => {
         :tile_directories => [