Faidon Liambotis has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/405208 )
Change subject: lxc: Fix support for stretch
......................................................................
lxc: Fix support for stretch
Was failing with
No matching entry for selector parameter with value 'stretch'
at /etc/puppet/modules/lxc/manifests/init.pp:23
Bug: T180377
Change-Id: I7a6974f262d22475e76d5b6980b46f06254a9676
---
M modules/lxc/manifests/init.pp
1 file changed, 30 insertions(+), 27 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/lxc/manifests/init.pp b/modules/lxc/manifests/init.pp
index 38f4aaa..02ac847 100644
--- a/modules/lxc/manifests/init.pp
+++ b/modules/lxc/manifests/init.pp
@@ -17,35 +17,38 @@
ensure => present,
}
- # T154294: Running a jessie image in the container requires newer versions
- # of LXC and it's dependencies than Trusty or Jessie shipped with.
- # Install the versions provided by backports instead.
- $backports = $::lsbdistcodename ? {
- trusty => [
- 'cgroup-lite',
- 'liblxc1',
- 'lxc',
- 'lxc-common',
- 'lxc-templates',
- 'lxc1',
- 'python3-lxc',
- ],
- jessie => [
- 'libapparmor1',
- 'liblxc1',
- 'libseccomp2',
- 'lxc',
- 'python3-lxc',
- ],
+ if os_version('ubuntu == trusty || debian == jessie') {
+ # T154294: Running a jessie image in the container requires newer
versions
+ # of LXC and it's dependencies than Trusty or Jessie shipped with.
+ # Install the versions provided by backports instead.
+ $backports = $::lsbdistcodename ? {
+ trusty => [
+ 'cgroup-lite',
+ 'liblxc1',
+ 'lxc',
+ 'lxc-common',
+ 'lxc-templates',
+ 'lxc1',
+ 'python3-lxc',
+ ],
+ jessie => [
+ 'libapparmor1',
+ 'liblxc1',
+ 'libseccomp2',
+ 'lxc',
+ 'python3-lxc',
+ ],
+ }
+
+ apt::pin { $backports:
+ pin => "release a=${::lsbdistcodename}-backports",
+ priority => 500,
+ before => Package['lxc'],
+ }
}
- apt::pin { $backports:
- pin => "release a=${::lsbdistcodename}-backports",
- priority => 500,
- }
- package { $backports:
- ensure => present,
- require => Apt::Pin[$backports],
+ package { 'lxc':
+ ensure => present,
}
if os_version('debian >= jessie') {
--
To view, visit https://gerrit.wikimedia.org/r/405208
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7a6974f262d22475e76d5b6980b46f06254a9676
Gerrit-PatchSet: 13
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Chasemp <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
