From 9cfac467d61744131c15f35ff779a99c731d211d Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Mon, 25 Jul 2022 22:20:41 +0100
Subject: [PATCH 1/1] Remove tile role from albi, necrosan and scorch

---
 roles/albi.rb     | 35 +----------------------------------
 roles/necrosan.rb | 35 +----------------------------------
 roles/scorch.rb   | 35 +----------------------------------
 3 files changed, 3 insertions(+), 102 deletions(-)

diff --git a/roles/albi.rb b/roles/albi.rb
index 7d45065c6..ea0a2a919 100644
--- a/roles/albi.rb
+++ b/roles/albi.rb
@@ -21,42 +21,9 @@ default_attributes(
         :gateway => "fe80::a293:51ff:fea2:ded5"
       }
     }
-  },
-  :postgresql => {
-    :settings => {
-      :defaults => {
-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",
-        :effective_cache_size => "16GB"
-      }
-    }
-  },
-  :sysctl => {
-    :postgres => {
-      :comment => "Increase shared memory for postgres",
-      :parameters => {
-        "kernel.shmmax" => 9 * 1024 * 1024 * 1024,
-        "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096
-      }
-    }
-  },
-  :tile => {
-    :database => {
-      :cluster => "14/main",
-      :postgis => "3"
-    },
-    :mapnik => "3.1",
-    :styles => {
-      :default => {
-        :tile_directories => [
-          { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
-        ]
-      }
-    }
   }
 )
 
 run_list(
-  "role[scaleway]",
-  "role[tile]"
+  "role[scaleway]"
 )
diff --git a/roles/necrosan.rb b/roles/necrosan.rb
index cd5abd119..0acab52e5 100644
--- a/roles/necrosan.rb
+++ b/roles/necrosan.rb
@@ -27,42 +27,9 @@ default_attributes(
         :gateway => "2a05:46c0:100:1004::"
       }
     }
-  },
-  :postgresql => {
-    :settings => {
-      :defaults => {
-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",
-        :effective_cache_size => "16GB"
-      }
-    }
-  },
-  :sysctl => {
-    :postgres => {
-      :comment => "Increase shared memory for postgres",
-      :parameters => {
-        "kernel.shmmax" => 9 * 1024 * 1024 * 1024,
-        "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096
-      }
-    }
-  },
-  :tile => {
-    :database => {
-      :cluster => "14/main",
-      :postgis => "3"
-    },
-    :mapnik => "3.1",
-    :styles => {
-      :default => {
-        :tile_directories => [
-          { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
-        ]
-      }
-    }
   }
 )
 
 run_list(
-  "role[appliwave]",
-  "role[tile]"
+  "role[appliwave]"
 )
diff --git a/roles/scorch.rb b/roles/scorch.rb
index 0775afde8..36b8e4450 100644
--- a/roles/scorch.rb
+++ b/roles/scorch.rb
@@ -39,42 +39,9 @@ default_attributes(
         :gateway => "2001:41d0:2:fcff:ff:ff:ff:ff"
       }
     }
-  },
-  :postgresql => {
-    :settings => {
-      :defaults => {
-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",
-        :effective_cache_size => "16GB"
-      }
-    }
-  },
-  :sysctl => {
-    :postgres => {
-      :comment => "Increase shared memory for postgres",
-      :parameters => {
-        "kernel.shmmax" => 9 * 1024 * 1024 * 1024,
-        "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096
-      }
-    }
-  },
-  :tile => {
-    :database => {
-      :cluster => "14/main",
-      :postgis => "3"
-    },
-    :mapnik => "3.1",
-    :styles => {
-      :default => {
-        :tile_directories => [
-          { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
-        ]
-      }
-    }
   }
 )
 
 run_list(
-  "role[ovh]",
-  "role[tile]"
+  "role[ovh]"
 )
-- 
2.39.5