From 009f9a8aac6120d491eb24880fdadb5edc09b494 Mon Sep 17 00:00:00 2001
From: Grant Slater <github@firefishy.com>
Date: Sun, 31 Aug 2025 04:19:30 +0100
Subject: [PATCH] Make debian and pg17 the default for tile role

---
 .github/workflows/test-kitchen.yml   | 3 ++-
 cookbooks/tile/attributes/default.rb | 2 +-
 roles/culebre.rb                     | 5 -----
 roles/nidhogg.rb                     | 5 -----
 roles/odin.rb                        | 5 -----
 roles/orm.rb                         | 5 -----
 roles/palulukon.rb                   | 5 -----
 roles/piasa.rb                       | 5 -----
 roles/wawel.rb                       | 5 -----
 roles/ysera.rb                       | 5 -----
 10 files changed, 3 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index 9f839d0cb..e332c9260 100644
--- a/.github/workflows/test-kitchen.yml
+++ b/.github/workflows/test-kitchen.yml
@@ -108,7 +108,6 @@ jobs:
           - sysctl
           - sysfs
           - taginfo
-          - tile
           - tilelog
           - tools
           - trac
@@ -165,6 +164,8 @@ jobs:
             suite: supybot
           - os: debian-12
             suite: taginfo
+          - os: debian-12
+            suite: tile
           - os: debian-12
             suite: trac
           - os: debian-12
diff --git a/cookbooks/tile/attributes/default.rb b/cookbooks/tile/attributes/default.rb
index cc5803d00..b9a5570e4 100644
--- a/cookbooks/tile/attributes/default.rb
+++ b/cookbooks/tile/attributes/default.rb
@@ -1,4 +1,4 @@
-default[:tile][:database][:cluster] = "14/main"
+default[:tile][:database][:cluster] = "17/main"
 default[:tile][:database][:postgis] = "3"
 default[:tile][:database][:node_file] = "/store/database/nodes"
 default[:tile][:database][:multi_geometry] = true
diff --git a/roles/culebre.rb b/roles/culebre.rb
index 53e6146c8..fac8a230f 100644
--- a/roles/culebre.rb
+++ b/roles/culebre.rb
@@ -47,11 +47,6 @@ default_attributes(
     }
   },
   :tile => {
-    :database => {
-      :cluster => "17/main",
-      :postgis => "3"
-    },
-    :mapnik => "3.1",
     :styles => {
       :default => {
         :tile_directories => [
diff --git a/roles/nidhogg.rb b/roles/nidhogg.rb
index 7081f79ee..1743edf2d 100644
--- a/roles/nidhogg.rb
+++ b/roles/nidhogg.rb
@@ -43,11 +43,6 @@ default_attributes(
     }
   },
   :tile => {
-    :database => {
-      :cluster => "17/main",
-      :postgis => "3"
-    },
-    :mapnik => "3.1",
     :styles => {
       :default => {
         :tile_directories => [
diff --git a/roles/odin.rb b/roles/odin.rb
index 67eb32fa1..6d16373e2 100644
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -109,11 +109,6 @@ default_attributes(
     }
   },
   :tile => {
-    :database => {
-      :cluster => "17/main",
-      :postgis => "3"
-    },
-    :mapnik => "3.1",
     :styles => {
       :default => {
         :tile_directories => [
diff --git a/roles/orm.rb b/roles/orm.rb
index eae85f8ec..d456c6f3c 100644
--- a/roles/orm.rb
+++ b/roles/orm.rb
@@ -114,11 +114,6 @@ default_attributes(
     }
   },
   :tile => {
-    :database => {
-      :cluster => "17/main",
-      :postgis => "3"
-    },
-    :mapnik => "3.1",
     :styles => {
       :default => {
         :tile_directories => [
diff --git a/roles/palulukon.rb b/roles/palulukon.rb
index 62a55ccf6..a78a8ce12 100644
--- a/roles/palulukon.rb
+++ b/roles/palulukon.rb
@@ -41,11 +41,6 @@ default_attributes(
     }
   },
   :tile => {
-    :database => {
-      :cluster => "17/main",
-      :postgis => "3"
-    },
-    :mapnik => "3.1",
     :styles => {
       :default => {
         :tile_directories => [
diff --git a/roles/piasa.rb b/roles/piasa.rb
index c0ab77788..667f30242 100644
--- a/roles/piasa.rb
+++ b/roles/piasa.rb
@@ -120,11 +120,6 @@ default_attributes(
     }
   },
   :tile => {
-    :database => {
-      :cluster => "17/main",
-      :postgis => "3"
-    },
-    :mapnik => "3.1",
     :styles => {
       :default => {
         :tile_directories => [
diff --git a/roles/wawel.rb b/roles/wawel.rb
index ff2d9674d..741626f2b 100644
--- a/roles/wawel.rb
+++ b/roles/wawel.rb
@@ -33,11 +33,6 @@ default_attributes(
     }
   },
   :tile => {
-    :database => {
-      :cluster => "17/main",
-      :postgis => "3"
-    },
-    :mapnik => "3.1",
     :styles => {
       :default => {
         :tile_directories => [
diff --git a/roles/ysera.rb b/roles/ysera.rb
index 4943e2e17..f45f48510 100644
--- a/roles/ysera.rb
+++ b/roles/ysera.rb
@@ -97,11 +97,6 @@ default_attributes(
     }
   },
   :tile => {
-    :database => {
-      :cluster => "17/main",
-      :postgis => "3"
-    },
-    :mapnik => "3.1",
     :styles => {
       :default => {
         :tile_directories => [
-- 
2.39.5