Gehel has submitted this change and it was merged.
Change subject: Postgresql / postgis: use full package name
......................................................................
Postgresql / postgis: use full package name
postgresql-postgis package does not always have the same name, sometimes
including the version of postgis as a suffix. Previously, puppet would
install multiple postgresql-postgis packages on jessie. This fixes the
package name and ensure we only install a single version of postgis,
which should fix the broken pupet run.
Bug: T147780
Change-Id: Ib98d47db15345d8e137ea91976a0c4e736e137b3
---
M hieradata/role/common/maps/server.yaml
M modules/postgresql/manifests/postgis.pp
2 files changed, 9 insertions(+), 10 deletions(-)
Approvals:
Gehel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/role/common/maps/server.yaml
b/hieradata/role/common/maps/server.yaml
index 2dceaae..dc4d798 100644
--- a/hieradata/role/common/maps/server.yaml
+++ b/hieradata/role/common/maps/server.yaml
@@ -1,5 +1,4 @@
cluster: maps
-postgresql::postgis::pgversion: 9.4
postgresql::spatialdb::postgis_version: 2.1
cassandra::cluster_name: maps
cassandra::data_directory_base: /srv/cassandra
diff --git a/modules/postgresql/manifests/postgis.pp
b/modules/postgresql/manifests/postgis.pp
index 0064f74..f559bb0 100644
--- a/modules/postgresql/manifests/postgis.pp
+++ b/modules/postgresql/manifests/postgis.pp
@@ -13,18 +13,18 @@
# include postgresql::postgis
#
class postgresql::postgis(
- $ensure='present',
- $pgversion = $::lsbdistcodename ? {
- jessie => '9.4',
- precise => '9.1',
- trusty => '9.3',
+ $ensure = 'present',
+ $postgresql_postgis_package = $::lsbdistcodename ? {
+ jessie => 'postgresql-9.4-postgis-2.1',
+ precise => 'postgresql-9.1-postgis',
+ trusty => 'postgresql-9.3-postgis-2.1',
},
- ) {
+) {
package { [
- "postgresql-${pgversion}-postgis",
- 'postgis',
- ]:
+ $postgresql_postgis_package,
+ 'postgis',
+ ]:
ensure => $ensure,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/315077
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib98d47db15345d8e137ea91976a0c4e736e137b3
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <gleder...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Gehel <gleder...@wikimedia.org>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Yurik <yu...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
