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

[chef.git] / roles / bowser.rb

diff --git a/roles/bowser.rb b/roles/bowser.rb
index 1ae0353930c4ceb789c0ef2ab733bc7d864a753b..eca0fa2cf3c7ab9b9490bc607c4ec18d00fbca97 100644 (file)
--- a/roles/bowser.rb
+++ b/roles/bowser.rb
@@ -2,35 +2,25 @@ name "bowser"
 description "Master role applied to bowser"
 
 default_attributes(
-  :apt => {
-    :sources => ["postgresql"]
-  },
-  :location => "Carlton, Victoria, Australia",
   :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 ens14f1np1]
         }
       }
-    },
-    :nameservers => [
-      "202.158.207.1",
-      "202.158.207.2"
-    ]
+    }
   },
   :postgresql => {
-    :versions => ["10"],
     :settings => {
       :defaults => {
-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",
         :effective_cache_size => "16GB"
       }
     }
@@ -46,10 +36,13 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "10/main",
-      :postgis => "2.4"
+      :cluster => "16/main",
+      :postgis => "3"
+    },
+    :mapnik => "3.1",
+    :replication => {
+      :directory => "/store/replication"
     },
-    :node_file => "/store/database/nodes",
     :styles => {
       :default => {
         :tile_directories => [