Merge remote-tracking branch 'github/pull/355' into master

[chef.git] / roles / ysera.rb

diff --git a/roles/ysera.rb b/roles/ysera.rb
index 33a88de1a1a3733370ae05902a133338becabc84..0428b24f8e3bc499cf25440ff5d0d868d52b3fd3 100644 (file)
--- a/roles/ysera.rb
+++ b/roles/ysera.rb
@@ -2,19 +2,16 @@ name "ysera"
 description "Master role applied to ysera"
 
 default_attributes(
-  :apt => {
-    :sources => ["postgresql"]
-  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth0.2801",
+        :interface => "eno1.2801",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.15"
       },
       :external_ipv4 => {
-        :interface => "eth0.2800",
+        :interface => "eno1.2800",
         :role => :external,
         :family => :inet,
         :address => "193.60.236.22"
@@ -22,7 +19,6 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["10"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
@@ -42,10 +38,9 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "10/main",
-      :postgis => "2.4"
+      :cluster => "12/main",
+      :postgis => "3"
     },
-    :node_file => "/store/database/nodes",
     :styles => {
       :default => {
         :tile_directories => [