From: Tom Hughes <tom@compton.nu>
Date: Sun, 16 Feb 2020 23:00:47 +0000 (+0000)
Subject: Default to using the upstream repository for postgres
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/b1b9d1a24cd4ec5bc9176af4342697a739db64e7?ds=sidebyside

Default to using the upstream repository for postgres
---

diff --git a/cookbooks/postgresql/attributes/default.rb b/cookbooks/postgresql/attributes/default.rb
index dce61724f..91ffbea5e 100644
--- a/cookbooks/postgresql/attributes/default.rb
+++ b/cookbooks/postgresql/attributes/default.rb
@@ -35,3 +35,5 @@ default[:postgresql][:settings][:defaults][:user_name_maps] = {}
 default[:postgresql][:settings][:defaults][:early_authentication_rules] = []
 default[:postgresql][:settings][:defaults][:late_authentication_rules] = []
 default[:postgresql][:settings][:defaults][:standby_mode] = "off"
+
+default[:apt][:sources] = node[:apt][:sources] | ["postgresql"]
diff --git a/cookbooks/postgresql/metadata.rb b/cookbooks/postgresql/metadata.rb
index aca2267b7..4233b1589 100644
--- a/cookbooks/postgresql/metadata.rb
+++ b/cookbooks/postgresql/metadata.rb
@@ -6,5 +6,6 @@ description       "Installs and configures postgresql"
 
 version           "1.0.0"
 supports          "ubuntu"
+depends           "apt"
 depends           "munin"
 depends           "ohai"
diff --git a/cookbooks/postgresql/recipes/default.rb b/cookbooks/postgresql/recipes/default.rb
index 9b17fae2a..4fec9a9af 100644
--- a/cookbooks/postgresql/recipes/default.rb
+++ b/cookbooks/postgresql/recipes/default.rb
@@ -17,6 +17,7 @@
 # limitations under the License.
 #
 
+include_recipe "apt"
 include_recipe "munin"
 
 package "locales-all"
diff --git a/roles/bowser.rb b/roles/bowser.rb
index ebee5e5d4..c7cda250a 100644
--- a/roles/bowser.rb
+++ b/roles/bowser.rb
@@ -2,9 +2,6 @@ name "bowser"
 description "Master role applied to bowser"
 
 default_attributes(
-  :apt => {
-    :sources => ["postgresql"]
-  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
diff --git a/roles/dev.rb b/roles/dev.rb
index 17b5c4726..70b6e1615 100644
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -95,9 +95,6 @@ default_attributes(
       :max_connections_per_child => 10000
     }
   },
-  :apt => {
-    :sources => ["postgresql"]
-  },
   :dev => {
     :rails => {
       :master => {
diff --git a/roles/eddie.rb b/roles/eddie.rb
index d900fbb4f..c96483527 100644
--- a/roles/eddie.rb
+++ b/roles/eddie.rb
@@ -2,9 +2,6 @@ name "eddie"
 description "Master role applied to eddie"
 
 default_attributes(
-  :apt => {
-    :sources => ["postgresql"]
-  },
   :db => {
     :cluster => "9.5/main"
   },
diff --git a/roles/karm.rb b/roles/karm.rb
index 8f0ce7a23..a8f6b9e29 100644
--- a/roles/karm.rb
+++ b/roles/karm.rb
@@ -2,9 +2,6 @@ name "karm"
 description "Master role applied to karm"
 
 default_attributes(
-  :apt => {
-    :sources => ["postgresql"]
-  },
   :db => {
     :cluster => "9.5/main"
   },
diff --git a/roles/katla.rb b/roles/katla.rb
index 1e471b040..6f5376f08 100644
--- a/roles/katla.rb
+++ b/roles/katla.rb
@@ -2,9 +2,6 @@ name "katla"
 description "Master role applied to katla"
 
 default_attributes(
-  :apt => {
-    :sources => ["postgresql"]
-  },
   :db => {
     :cluster => "9.5/main"
   },
diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 9bfcc288d..504fd6f0d 100644
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -27,9 +27,6 @@ default_attributes(
       :listen_cores_buckets_ratio => 6
     }
   },
-  :apt => {
-    :sources => ["postgresql"]
-  },
   :networking => {
     :firewall => {
       :http_rate_limit => "s:2/sec:15"
diff --git a/roles/odin.rb b/roles/odin.rb
index b6c64a1b1..9b7975aaf 100644
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -2,9 +2,6 @@ name "odin"
 description "Master role applied to odin"
 
 default_attributes(
-  :apt => {
-    :sources => ["postgresql"]
-  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
diff --git a/roles/pyrene.rb b/roles/pyrene.rb
index b3bee0f77..9164524f0 100644
--- a/roles/pyrene.rb
+++ b/roles/pyrene.rb
@@ -2,9 +2,6 @@ name "pyrene"
 description "Master role applied to pyrene"
 
 default_attributes(
-  :apt => {
-    :sources => ["postgresql"]
-  },
   :munin => {
     :plugins => {
       :hpasmcli2_temp => {
diff --git a/roles/rhaegal.rb b/roles/rhaegal.rb
index fa2480be4..ed44c2944 100644
--- a/roles/rhaegal.rb
+++ b/roles/rhaegal.rb
@@ -7,9 +7,6 @@ default_attributes(
       :mmiler => { :status => :administrator }
     }
   },
-  :apt => {
-    :sources => ["postgresql"]
-  },
   :location => "Zagreb, Croatia",
   :munin => {
     :plugins => {
diff --git a/roles/scorch.rb b/roles/scorch.rb
index 07c2932e4..82c6eb573 100644
--- a/roles/scorch.rb
+++ b/roles/scorch.rb
@@ -2,9 +2,6 @@ name "scorch"
 description "Master role applied to scorch"
 
 default_attributes(
-  :apt => {
-    :sources => ["postgresql"]
-  },
   :devices => {
     :ssd_system => {
       :comment => "Tune scheduler for system disk",
diff --git a/roles/ysera.rb b/roles/ysera.rb
index b23b6da26..8bc9d14c0 100644
--- a/roles/ysera.rb
+++ b/roles/ysera.rb
@@ -2,9 +2,6 @@ name "ysera"
 description "Master role applied to ysera"
 
 default_attributes(
-  :apt => {
-    :sources => ["postgresql"]
-  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {