Ori.livneh has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/201962

Change subject: postgresql: choose distro-appropriate default version
......................................................................

postgresql: choose distro-appropriate default version

Make the postgresql version default to a value that works for the distribution
release: 9.4 on Jessie, 9.3 on Trusty, and 9.1 elsewhere.

Change-Id: I8bab8817a0541a6e1681a7c21a00e427b937995f
---
M modules/postgresql/manifests/server.pp
1 file changed, 8 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/62/201962/1

diff --git a/modules/postgresql/manifests/server.pp 
b/modules/postgresql/manifests/server.pp
index b84f797..e7d3ca4 100644
--- a/modules/postgresql/manifests/server.pp
+++ b/modules/postgresql/manifests/server.pp
@@ -4,7 +4,8 @@
 #
 # Parameters:
 #   pgversion
-#       Defaults to 9.1. Valid values 8.4, 9.1 in Ubuntu Precise
+#       Defaults to 9.1. Valid values 8.4, 9.1 in Ubuntu Precise,
+#       9.3 in Ubuntu Trusty, and 9.4 in Debian Jessie.
 #   ensure
 #       Defaults to present
 #   includes
@@ -20,14 +21,17 @@
 #  include postgresql::server
 #
 class postgresql::server(
-    $pgversion='9.1',
+    $pgversion = $::lsbdistcodename ? {
+        jessie  => '9.4',
+        trusty  => '9.3',
+        default => '9.1',
+    },
     $ensure='present',
     $includes=[],
     $listen_addresses='*',
     $port='5432',
     $datadir=undef,
-    ) {
-
+) {
     package { [
             "postgresql-${pgversion}",
             "postgresql-${pgversion}-debversion",

-- 
To view, visit https://gerrit.wikimedia.org/r/201962
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8bab8817a0541a6e1681a7c21a00e427b937995f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to