Merge interface families

[chef.git] / roles / ysera.rb

diff --git a/roles/ysera.rb b/roles/ysera.rb
index 025a48235a4616dd4c3e15e5b168f4a4f5178008..f00192ac062a675781620987f4839159f5074d71 100644 (file)
--- a/roles/ysera.rb
+++ b/roles/ysera.rb
@@ -4,22 +4,23 @@ description "Master role applied to ysera"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
+      :internal => {
         :interface => "eno1.2801",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.0.15"
+        :inet => {
+          :address => "10.0.0.15"
+        }
       },
-      :external_ipv4 => {
+      :external => {
         :interface => "eno1.2800",
         :role => :external,
-        :family => :inet,
-        :address => "193.60.236.22"
+        :inet => {
+          :address => "193.60.236.22"
+        }
       }
     }
   },
   :postgresql => {
-    :versions => ["12"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
@@ -39,12 +40,12 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "12/main",
+      :cluster => "14/main",
       :postgis => "3"
     },
+    :mapnik => "3.1",
     :styles => {
       :default => {
-        :revision => "v5.0.0",
         :tile_directories => [
           { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
         ]