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

[chef.git] / roles / bowser.rb

diff --git a/roles/bowser.rb b/roles/bowser.rb
index 7f644a5ff56d47a10056b1a850044d5090157914..eca0fa2cf3c7ab9b9490bc607c4ec18d00fbca97 100644 (file)
--- a/roles/bowser.rb
+++ b/roles/bowser.rb
@@ -4,25 +4,23 @@ description "Master role applied to bowser"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

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

         :interface => "bond0",
         :role => :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 => {
         :bond => {

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

         }
       }
     }
   },
   :postgresql => {
         }
       }
     }
   },
   :postgresql => {

-    :versions => ["12"],

     :settings => {
       :defaults => {
     :settings => {
       :defaults => {

-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",

         :effective_cache_size => "16GB"
       }
     }
         :effective_cache_size => "16GB"
       }
     }


@@ -38,12 +36,15 @@ default_attributes(
   },
   :tile => {
     :database => {
   },
   :tile => {
     :database => {

-      :cluster => "12/main",
+      :cluster => "16/main",

       :postgis => "3"
     },
       :postgis => "3"
     },

+    :mapnik => "3.1",
+    :replication => {
+      :directory => "/store/replication"
+    },

     :styles => {
       :default => {
     :styles => {
       :default => {

-        :revision => "v5.0.0",

         :tile_directories => [
           { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
         ]
         :tile_directories => [
           { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
         ]