Default to using the upstream repository for postgres

diff --git a/cookbooks/postgresql/attributes/default.rb b/cookbooks/postgresql/attributes/default.rb
index dce61724fdf3ee97979813a2e3f26a9b1a8a44ed..91ffbea5e7b227cf3e9fb4de81cd3b8e0fe363c4 100644 (file)
--- 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[: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 aca2267b73c01dab0d44ca4dadadd7d007d86bb3..4233b15893b1455069bbc53e712119f2be49ffd3 100644 (file)
--- 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"
 
 version           "1.0.0"
 supports          "ubuntu"

+depends           "apt"

 depends           "munin"
 depends           "ohai"
 depends           "munin"
 depends           "ohai"

diff --git a/cookbooks/postgresql/recipes/default.rb b/cookbooks/postgresql/recipes/default.rb
index 9b17fae2a4a7a641ce2d76785ab223b8dcee38fb..4fec9a9afe1ccd1fa89000b389a41863fd18b86b 100644 (file)
--- a/cookbooks/postgresql/recipes/default.rb
+++ b/cookbooks/postgresql/recipes/default.rb
@@ -17,6 +17,7 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "apt"

 include_recipe "munin"
 
 package "locales-all"
 include_recipe "munin"
 
 package "locales-all"

diff --git a/roles/bowser.rb b/roles/bowser.rb
index ebee5e5d44b570f56a2e5c4722203a134862f6f9..c7cda250a24ef5c4d96d9879e119878a95bf7925 100644 (file)
--- a/roles/bowser.rb
+++ b/roles/bowser.rb
@@ -2,9 +2,6 @@ name "bowser"
 description "Master role applied to bowser"
 
 default_attributes(
 description "Master role applied to bowser"
 
 default_attributes(

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

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

diff --git a/roles/dev.rb b/roles/dev.rb
index 17b5c4726072897a5a0a114ca31cce6452c4d8b3..70b6e1615a617e3d1f1cd5a3e06f7fba855d5049 100644 (file)
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -95,9 +95,6 @@ default_attributes(
       :max_connections_per_child => 10000
     }
   },
       :max_connections_per_child => 10000
     }
   },

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

   :dev => {
     :rails => {
       :master => {
   :dev => {
     :rails => {
       :master => {

diff --git a/roles/eddie.rb b/roles/eddie.rb
index d900fbb4f41dfe7d1d0809cf6680d2f5596ffdf3..c96483527f78d3f410c5119c466e243601b4d853 100644 (file)
--- a/roles/eddie.rb
+++ b/roles/eddie.rb
@@ -2,9 +2,6 @@ name "eddie"
 description "Master role applied to eddie"
 
 default_attributes(
 description "Master role applied to eddie"
 
 default_attributes(

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

   :db => {
     :cluster => "9.5/main"
   },
   :db => {
     :cluster => "9.5/main"
   },

diff --git a/roles/karm.rb b/roles/karm.rb
index 8f0ce7a234de14536cf422a0bbc8028ad677c389..a8f6b9e29eb94a1e38b55f06c55b4f1dfd33ea60 100644 (file)
--- a/roles/karm.rb
+++ b/roles/karm.rb
@@ -2,9 +2,6 @@ name "karm"
 description "Master role applied to karm"
 
 default_attributes(
 description "Master role applied to karm"
 
 default_attributes(

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

   :db => {
     :cluster => "9.5/main"
   },
   :db => {
     :cluster => "9.5/main"
   },

diff --git a/roles/katla.rb b/roles/katla.rb
index 1e471b04099e2c6737c1da56884f8a973b03e198..6f5376f0889cb28dd8dc043e609255d07098900b 100644 (file)
--- a/roles/katla.rb
+++ b/roles/katla.rb
@@ -2,9 +2,6 @@ name "katla"
 description "Master role applied to katla"
 
 default_attributes(
 description "Master role applied to katla"
 
 default_attributes(

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

   :db => {
     :cluster => "9.5/main"
   },
   :db => {
     :cluster => "9.5/main"
   },

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 9bfcc288d2dad4112584498adc1870ee03812d8e..504fd6f0d9e00b64dc216786e680357a09ed0ebd 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -27,9 +27,6 @@ default_attributes(
       :listen_cores_buckets_ratio => 6
     }
   },
       :listen_cores_buckets_ratio => 6
     }
   },

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

   :networking => {
     :firewall => {
       :http_rate_limit => "s:2/sec:15"
   :networking => {
     :firewall => {
       :http_rate_limit => "s:2/sec:15"

diff --git a/roles/odin.rb b/roles/odin.rb
index b6c64a1b1a8d8a946392913a3a6aaf297a8d74ac..9b7975aafeb7d22da9decbf4f9981e8b732f5f2f 100644 (file)
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -2,9 +2,6 @@ name "odin"
 description "Master role applied to odin"
 
 default_attributes(
 description "Master role applied to odin"
 
 default_attributes(

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

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

diff --git a/roles/pyrene.rb b/roles/pyrene.rb
index b3bee0f770bfa0d64cd31ad42ad6e182ca95a533..9164524f084f586f2e9c6b01efc20bcab4748585 100644 (file)
--- a/roles/pyrene.rb
+++ b/roles/pyrene.rb
@@ -2,9 +2,6 @@ name "pyrene"
 description "Master role applied to pyrene"
 
 default_attributes(
 description "Master role applied to pyrene"
 
 default_attributes(

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

   :munin => {
     :plugins => {
       :hpasmcli2_temp => {
   :munin => {
     :plugins => {
       :hpasmcli2_temp => {

diff --git a/roles/rhaegal.rb b/roles/rhaegal.rb
index fa2480be414353e221c2cb76a73bf9675d32aa8d..ed44c294407c9b1d9cc62ee5055be220a89b01e5 100644 (file)
--- a/roles/rhaegal.rb
+++ b/roles/rhaegal.rb
@@ -7,9 +7,6 @@ default_attributes(
       :mmiler => { :status => :administrator }
     }
   },
       :mmiler => { :status => :administrator }
     }
   },

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

   :location => "Zagreb, Croatia",
   :munin => {
     :plugins => {
   :location => "Zagreb, Croatia",
   :munin => {
     :plugins => {

diff --git a/roles/scorch.rb b/roles/scorch.rb
index 07c2932e46230752ed72f621c3247b24b8eaf011..82c6eb5732e174b1051de02bd81b60fdb0d543ea 100644 (file)
--- a/roles/scorch.rb
+++ b/roles/scorch.rb
@@ -2,9 +2,6 @@ name "scorch"
 description "Master role applied to scorch"
 
 default_attributes(
 description "Master role applied to scorch"
 
 default_attributes(

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

   :devices => {
     :ssd_system => {
       :comment => "Tune scheduler for system disk",
   :devices => {
     :ssd_system => {
       :comment => "Tune scheduler for system disk",

diff --git a/roles/ysera.rb b/roles/ysera.rb
index b23b6da265744ad3d858591d789fb31560a63ae8..8bc9d14c0b427e6b059d7a447c2b275d29b64557 100644 (file)
--- a/roles/ysera.rb
+++ b/roles/ysera.rb
@@ -2,9 +2,6 @@ name "ysera"
 description "Master role applied to ysera"
 
 default_attributes(
 description "Master role applied to ysera"
 
 default_attributes(

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

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