Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Purge /etc/apt/apt.conf
......................................................................
Purge /etc/apt/apt.conf
/etc/apt/apt.conf gets created during the installation process, either
via d-i or labs vmbuilder. It is no longer needed after the install is
over and given it is unpuppetized it causes various problems during
migrations
This was found during RT: 6133
Change-Id: I8c0031851f2f3cf5aa0b558a564e31de70cfbfc8
---
M modules/apt/manifests/init.pp
1 file changed, 12 insertions(+), 0 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/apt/manifests/init.pp b/modules/apt/manifests/init.pp
index 35170a4..c9df4c6 100644
--- a/modules/apt/manifests/init.pp
+++ b/modules/apt/manifests/init.pp
@@ -47,6 +47,18 @@
esams => present,
default => absent
}
+ # This will munge /etc/apt/apt.conf that get's created during installation
+ # process (either labs vmbuilder or d-i). Given the ones below exist, it is
+ # no longer needed after the installation is over
+ file { '/etc/apt/apt.conf':
+ ensure => absent,
+ require => [
+ Apt::Conf['wikimedia-proxy'],
+ Apt::Conf['security-ubuntu-proxy'],
+ Apt::Conf['ubuntu-cloud-archive-proxy'],
+ Apt::Conf['old-releases-proxy'],
+ ]
+ }
apt::conf {
'wikimedia-proxy':
ensure => absent,
--
To view, visit https://gerrit.wikimedia.org/r/123628
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8c0031851f2f3cf5aa0b558a564e31de70cfbfc8
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
