Faidon Liambotis has submitted this change and it was merged.
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, 9 insertions(+), 2 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/postgresql/manifests/server.pp
b/modules/postgresql/manifests/server.pp
index b84f797..c4351fa 100644
--- a/modules/postgresql/manifests/server.pp
+++ b/modules/postgresql/manifests/server.pp
@@ -4,7 +4,10 @@
#
# Parameters:
# pgversion
-# Defaults to 9.1. Valid values 8.4, 9.1 in Ubuntu Precise
+# Defaults to 9.1 in Ubuntu Precise, 9.3 in Ubuntu Trusty,
+# and 9.4 in Debian Jessie. Ubuntu Precise may choose 8.4.
+# FIXME: Just use the unversioned package name and let apt
+# do the right thing.
# ensure
# Defaults to present
# includes
@@ -20,7 +23,11 @@
# include postgresql::server
#
class postgresql::server(
- $pgversion='9.1',
+ $pgversion = $::lsbdistcodename ? {
+ jessie => '9.4',
+ precise => '9.1',
+ trusty => '9.3',
+ },
$ensure='present',
$includes=[],
$listen_addresses='*',
--
To view, visit https://gerrit.wikimedia.org/r/201962
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8bab8817a0541a6e1681a7c21a00e427b937995f
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
