imagery: switch to file:// based mosaic for ZA

[chef.git] / roles / ysera.rb

diff --git a/roles/ysera.rb b/roles/ysera.rb
index b23b6da265744ad3d858591d789fb31560a63ae8..889bf27e9a4443b58e248d21691936eed298ca7a 100644 (file)
--- a/roles/ysera.rb
+++ b/roles/ysera.rb
@@ -2,31 +2,27 @@ name "ysera"
 description "Master role applied to ysera"
 
 default_attributes(
 description "Master role applied to ysera"
 
 default_attributes(

-  :apt => {
-    :sources => ["postgresql"]
-  },

   :networking => {
     :interfaces => {
   :networking => {
     :interfaces => {

-      :internal_ipv4 => {
+      :internal => {

         :interface => "eno1.2801",
         :role => :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,
         :interface => "eno1.2800",
         :role => :external,

-        :family => :inet,
-        :address => "193.60.236.22"
+        :inet => {
+          :address => "193.60.236.22"
+        }

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

-    :versions => ["10"],

     :settings => {
       :defaults => {
     :settings => {
       :defaults => {

-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",

         :effective_cache_size => "16GB"
       }
     }
         :effective_cache_size => "16GB"
       }
     }


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

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

     },
     },

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

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