BryanDavis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/393497 )
Change subject: apt: Remove jessie-backports pinning
......................................................................
apt: Remove jessie-backports pinning
Backports are not needed (yet) on stretch.
Bug: T181354
Change-Id: I5c5bc73a9e38afe71aea3a0b39b2cb6b30e08bb9
---
M puppet/modules/apt/manifests/ppa.pp
M puppet/modules/git/manifests/init.pp
M puppet/modules/role/manifests/horizon.pp
M puppet/modules/role/manifests/keystone.pp
M puppet/modules/swift/manifests/init.pp
M puppet/modules/thumbor/manifests/init.pp
6 files changed, 2 insertions(+), 46 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/97/393497/1
diff --git a/puppet/modules/apt/manifests/ppa.pp
b/puppet/modules/apt/manifests/ppa.pp
index 67e15ce..260cc93 100644
--- a/puppet/modules/apt/manifests/ppa.pp
+++ b/puppet/modules/apt/manifests/ppa.pp
@@ -33,7 +33,7 @@
$onlyif = "/usr/bin/test -e ${listfile}"
} else {
# PPA's are for Ubuntu, not Debian but may work if we hack the distro
- # name to be a modern Ubuntu LTS instead of jessie.
+ # name to be a modern Ubuntu LTS instead of stretch.
$command = "/usr/bin/add-apt-repository --yes ppa:${ppa} && /bin/sed
-i 's/${::lsbdistcodename}/xenial/g' ${listfile} && /usr/bin/apt-get update"
$onlyif = "/usr/bin/test ! -e ${listfile}"
}
diff --git a/puppet/modules/git/manifests/init.pp
b/puppet/modules/git/manifests/init.pp
index acc39e5..ce8663d 100644
--- a/puppet/modules/git/manifests/init.pp
+++ b/puppet/modules/git/manifests/init.pp
@@ -32,15 +32,9 @@
'git',
'git-man',
]
- apt::pin { 'git':
- package => join(sort($packages), ' '),
- pin => 'release a=jessie-backports',
- priority => '1001',
- }
package { $packages:
ensure => 'present',
- require => Apt::Pin['git'],
}
package { 'git-review':
diff --git a/puppet/modules/role/manifests/horizon.pp
b/puppet/modules/role/manifests/horizon.pp
index b3c7324..739292e 100644
--- a/puppet/modules/role/manifests/horizon.pp
+++ b/puppet/modules/role/manifests/horizon.pp
@@ -94,15 +94,8 @@
'python-xstatic-term.js',
]
- apt::pin { 'horizon':
- package => join(sort($packages), ' '),
- pin => 'release a=jessie-backports',
- priority => '1001',
- }
-
package { $packages:
ensure => 'present',
- require => Apt::Pin['horizon'],
}
file { "${log_dir}/horizon":
diff --git a/puppet/modules/role/manifests/keystone.pp
b/puppet/modules/role/manifests/keystone.pp
index bf21d54..0bc0ff2 100644
--- a/puppet/modules/role/manifests/keystone.pp
+++ b/puppet/modules/role/manifests/keystone.pp
@@ -68,15 +68,8 @@
'websockify',
]
- apt::pin { 'keystone':
- package => join(sort($packages), ' '),
- pin => 'release a=jessie-backports',
- priority => '1001',
- }
-
package { $packages:
ensure => 'present',
- require => Apt::Pin['keystone'],
}
mysql::db { 'keystone':
diff --git a/puppet/modules/swift/manifests/init.pp
b/puppet/modules/swift/manifests/init.pp
index ceac5fa..51c3bfc 100644
--- a/puppet/modules/swift/manifests/init.pp
+++ b/puppet/modules/swift/manifests/init.pp
@@ -62,23 +62,8 @@
'swift*'
]
- apt::pin { 'swift-python-backports':
- package => join(sort($packages), ' '),
- pin => 'release a=jessie-backports',
- priority => '1000',
- }
-
- package { ['swift', 'swift-account', 'swift-container', 'swift-object',
'swift-proxy', 'python-webob']:
+ package { ['swift', 'swift-account', 'swift-container', 'swift-object',
'swift-proxy', 'python-webob', 'python-swiftclient']:
ensure => 'present',
- require => [
- Apt::Pin['swift-python-backports'],
- ],
- }
-
- exec { 'ins-apt-python-swiftclient':
- command => '/usr/bin/apt-get update && /usr/bin/apt-get install -y
--force-yes -t jessie-backports "python-swiftclient"',
- environment => 'DEBIAN_FRONTEND=noninteractive',
- unless => '/usr/bin/dpkg -l python-swiftclient',
}
user { 'swift':
diff --git a/puppet/modules/thumbor/manifests/init.pp
b/puppet/modules/thumbor/manifests/init.pp
index d27ef9b..784e4e7 100644
--- a/puppet/modules/thumbor/manifests/init.pp
+++ b/puppet/modules/thumbor/manifests/init.pp
@@ -32,12 +32,6 @@
'python-pil',
]
- apt::pin { 'thumbor-python-backports':
- package => join(sort($packages), ' '),
- pin => 'release a=jessie-backports',
- priority => '1000',
- }
-
package { 'raven':
provider => 'pip',
}
@@ -45,9 +39,6 @@
package { 'python-thumbor-wikimedia':
ensure => 'present',
notify => Exec['stop-and-disable-default-thumbor-service'],
- require => [
- Apt::Pin['thumbor-python-backports'],
- ]
}
exec { 'stop-and-disable-default-thumbor-service':
--
To view, visit https://gerrit.wikimedia.org/r/393497
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c5bc73a9e38afe71aea3a0b39b2cb6b30e08bb9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
