Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Remove apt::pin for squid packages
......................................................................
Remove apt::pin for squid packages
In the pre-Varnish era, Wikimedia production was based on squid 2.x.
When we did the precise upgrade, squid 3.x came, so we had to include
our own builds of squid 2.x package in our repository.
install-server & url_downloader were transitioned to squid 3.x long ago
and for that they needed apt pins to use Ubuntu's version rather than
our own.
Now that we don't need this anymore and those packages have been removed
from apt, remove our custom apt::pin.
Note that this doesn't actually remove the pin, as apt preferences.d is
not puppet-managed; since it's just two hosts, it will cleaned up
manually after this gets merged.
Change-Id: Ibc44681745c44e4ec6dafdf40dc8838032327a9e
---
M manifests/role/install-server.pp
M manifests/role/url_downloader.pp
2 files changed, 0 insertions(+), 14 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/install-server.pp b/manifests/role/install-server.pp
index eca9843..8d07909 100644
--- a/manifests/role/install-server.pp
+++ b/manifests/role/install-server.pp
@@ -20,7 +20,6 @@
# Define['backup::set']
# Class['base::firewall']
# Define['ferm::rule']
-# Define['apt::pin']
#
# Sample Usage:
# include role::installserver
@@ -83,12 +82,6 @@
'srv-wikimedia',
]
backup::set { $sets : }
-
- apt::pin { [ 'squid3', 'squid-common3', 'squid-langpack' ]:
- pin => 'release o=Ubuntu',
- priority => '1001',
- before => Package['squid3'],
- }
# Monitoring
monitoring::service { 'squid':
diff --git a/manifests/role/url_downloader.pp b/manifests/role/url_downloader.pp
index 3518ef2..09844e2 100644
--- a/manifests/role/url_downloader.pp
+++ b/manifests/role/url_downloader.pp
@@ -12,7 +12,6 @@
# Pin our packages
#
# Requires:
-# Definition Apt::pin
# Module url_downloader
# ferm
# nagios definitions for wmf
@@ -29,12 +28,6 @@
class { '::url_downloader':
service_ip => $url_downloader_ip
- }
-
- apt::pin { [ 'squid3', 'squid-common3', 'squid-langpack' ]:
- pin => 'release o=Ubuntu',
- priority => '1001',
- before => Class['::url_downloader'],
}
# Firewall
--
To view, visit https://gerrit.wikimedia.org/r/179080
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc44681745c44e4ec6dafdf40dc8838032327a9e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
