Muehlenhoff has uploaded a new change for review. (
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 cp* 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, 10 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/20/336420/1
diff --git a/modules/apt/manifests/init.pp b/modules/apt/manifests/init.pp
index 3091102..9db48ad 100644
--- a/modules/apt/manifests/init.pp
+++ b/modules/apt/manifests/init.pp
@@ -117,6 +117,16 @@
}
}
+ if hiera('add_experimental_repo', false) {
+ if $::operatingsystem == 'Debian' {
+ apt::repository { 'wikimedia-experimental':
+ 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 35c52d4..39309f8 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: newchange
Gerrit-Change-Id: If8f74528e2cd2fc00d510350792908d0eb806da5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
