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

[chef.git] / roles / bowser.rb

diff --git a/roles/bowser.rb b/roles/bowser.rb
index c7cda250a24ef5c4d96d9879e119878a95bf7925..a12c9887e06dd0e6081c3460c465d11f4233be52 100644 (file)
--- a/roles/bowser.rb
+++ b/roles/bowser.rb
@@ -4,21 +4,21 @@ 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 ens14f0np1]

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

-    :versions => ["10"],

     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",


@@ -38,10 +38,10 @@ default_attributes(
   },
   :tile => {
     :database => {
   },
   :tile => {
     :database => {

-      :cluster => "10/main",
-      :postgis => "2.4"
+      :cluster => "14/main",
+      :postgis => "3"

     },
     },

-    :node_file => "/store/database/nodes",
+    :mapnik => "3.1",

     :styles => {
       :default => {
         :tile_directories => [
     :styles => {
       :default => {
         :tile_directories => [