Gehel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/314244
Change subject: osm - use osm2pgsql from jessie-backport
......................................................................
osm - use osm2pgsql from jessie-backport
Pinning osm2pgsql to jessie-backports is a cleaner solution then
explicitely ensuring a specific version of osm2pgsql.
Change-Id: I11ba34e6a8e5be9b465d57d617fb498bb954bea8
---
M modules/osm/manifests/init.pp
1 file changed, 6 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/44/314244/1
diff --git a/modules/osm/manifests/init.pp b/modules/osm/manifests/init.pp
index 7592ca4..6da5063 100644
--- a/modules/osm/manifests/init.pp
+++ b/modules/osm/manifests/init.pp
@@ -6,25 +6,13 @@
# osm2pgsql 0.90 is only available on jessie at the moment
# there is no need for 0.90 on labs machines (precise)
- $osm2pgsql_ensure = $ensure ? {
- 'present' => os_version('Debian >= Jessie') ? {
- true => '0.90.0+ds-1~bpo8+1',
- default => 'present',
- },
- default => $ensure,
- }
-
- # Can't use require_package here because we need to specify version
- # from jessie-backports:
- if !defined(Package['osm2pgsql']) {
- package { 'osm2pgsql':
- ensure => $osm2pgsql_ensure,
+ if os_version('Debian == Jessie') {
+ apt::pin { 'osm2pgsql':
+ pin => 'release a=jessie-wikimedia c=backports',
+ priority => '1001',
+ before => Package['osm2pgsql'],
}
}
- if !defined(Package['osmosis']) {
- package { 'osmosis':
- ensure => $ensure,
- }
- }
+ require_package('osm2pgsql', 'osmosis')
}
--
To view, visit https://gerrit.wikimedia.org/r/314244
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I11ba34e6a8e5be9b465d57d617fb498bb954bea8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <gleder...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
