Yuvipanda has submitted this change and it was merged.
Change subject: aptly: Force remove multiarch support in precise
......................................................................
aptly: Force remove multiarch support in precise
Bug: T111760
Change-Id: I5c9fac2224affae4edc47fb698ba30de465679e8
---
M modules/aptly/manifests/client.pp
1 file changed, 9 insertions(+), 0 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/aptly/manifests/client.pp
b/modules/aptly/manifests/client.pp
index 8413890..30508a7 100644
--- a/modules/aptly/manifests/client.pp
+++ b/modules/aptly/manifests/client.pp
@@ -2,6 +2,15 @@
$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 => Exect['apt-get update'],
+ }
+ }
+
apt::repository { 'project-aptly':
uri => "http://${servername}/repo";,
dist => "${::lsbdistcodename}-${::labsproject}",
--
To view, visit https://gerrit.wikimedia.org/r/236745
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5c9fac2224affae4edc47fb698ba30de465679e8
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
