Andrew Bogott has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/345371 )
Change subject: aptly: remove special case to remove multiarch support on
precise
......................................................................
aptly: remove special case to remove multiarch support on precise
Bug: T111760
Change-Id: I06721dd0766afb719b41306abdcd4125fdaba952
---
M modules/aptly/manifests/client.pp
1 file changed, 0 insertions(+), 9 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
StudiesWorld: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/aptly/manifests/client.pp
b/modules/aptly/manifests/client.pp
index fba80ac..c012b03 100644
--- a/modules/aptly/manifests/client.pp
+++ b/modules/aptly/manifests/client.pp
@@ -2,15 +2,6 @@
$servername,
$source=false
) {
- if os_version('ubuntu <= precise') {
- # Remove multiarch support in precise aptly clients.
- # Can be removed when T111760 is fixed
- file { '/etc/dpkg/dpkg.cfg.d/multiarch':
- ensure => absent,
- notify => Exec['apt-get update'],
- }
- }
-
apt::repository { 'project-aptly':
uri => "http://${servername}/repo";,
dist => "${::lsbdistcodename}-${::labsproject}",
--
To view, visit https://gerrit.wikimedia.org/r/345371
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I06721dd0766afb719b41306abdcd4125fdaba952
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Rush <r...@wikimedia.org>
Gerrit-Reviewer: StudiesWorld <ben.brown.kni...@gmail.com>
Gerrit-Reviewer: Tim Landscheidt <t...@tim-landscheidt.de>
Gerrit-Reviewer: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
