Merge interface families

[chef.git] / roles / ysera.rb

diff --git a/roles/ysera.rb b/roles/ysera.rb
index 8bc9d14c0b427e6b059d7a447c2b275d29b64557..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 => ["10"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
@@ -39,10 +40,10 @@ default_attributes(
   },
   :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 => [