Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/336420 )
Change subject: Make the experimental archive section generally available
......................................................................
Make the experimental archive section generally available
This was initially used to test the 4.4 Linux kernel (and after that for
Varnish), but it's generally useful (e.g. for testing the Jenkins 2
migration), so move it to the standard apt module and make it configurable
via Hiera
This also removes the apt source from the lvs* hosts, where it's no longer
needed ATM.
Change-Id: If8f74528e2cd2fc00d510350792908d0eb806da5
---
M modules/apt/manifests/init.pp
M modules/role/manifests/lvs/balancer.pp
2 files changed, 17 insertions(+), 10 deletions(-)
Approvals:
Muehlenhoff: Looks good to me, but someone else must approve
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, approved
diff --git a/modules/apt/manifests/init.pp b/modules/apt/manifests/init.pp
index a39bf72..8d5553e 100644
--- a/modules/apt/manifests/init.pp
+++ b/modules/apt/manifests/init.pp
@@ -1,5 +1,6 @@
class apt(
- $use_proxy = true
+ $use_proxy = true,
+ $use_experimental = hiera('apt::use_experimental', false),
) {
exec { 'apt-get update':
path => '/usr/bin',
@@ -118,6 +119,21 @@
}
}
+ $use_experimental_ensure = $use_experimental ? {
+ true => present,
+ false => absent,
+ default => absent,
+ }
+
+ if $::operatingsystem == 'Debian' {
+ apt::repository { 'wikimedia-experimental':
+ ensure => $use_experimental_ensure,
+ uri => 'http://apt.wikimedia.org/wikimedia',
+ dist => "${::lsbdistcodename}-wikimedia",
+ components => 'experimental',
+ }
+ }
+
# apt-get should not install recommended packages
apt::conf { 'no-recommends':
ensure => 'present',
diff --git a/modules/role/manifests/lvs/balancer.pp
b/modules/role/manifests/lvs/balancer.pp
index a62fd5e..2dc18ed 100644
--- a/modules/role/manifests/lvs/balancer.pp
+++ b/modules/role/manifests/lvs/balancer.pp
@@ -118,15 +118,6 @@
replace => true,
}
- # temporary experimental component used here as it includes a newer Linux
kernel
- if $::operatingsystem == 'Debian' {
- apt::repository { 'wikimedia-experimental':
- uri => 'http://apt.wikimedia.org/wikimedia',
- dist => "${::lsbdistcodename}-wikimedia",
- components => 'experimental',
- }
- }
-
class { '::lvs::balancer':
service_ips => $lvs_balancer_ips,
lvs_services => $lvs::configuration::lvs_services,
--
To view, visit https://gerrit.wikimedia.org/r/336420
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If8f74528e2cd2fc00d510350792908d0eb806da5
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Ema <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
