Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226712
Change subject: contint::packages: factor c::p::apt out
......................................................................
contint::packages: factor c::p::apt out
Change-Id: I9a40fb865904c09244eb10bce7f292fdcbe8101a
---
A modules/contint/manifests/packages/apt.pp
M modules/contint/manifests/packages/labs.pp
2 files changed, 31 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/12/226712/1
diff --git a/modules/contint/manifests/packages/apt.pp
b/modules/contint/manifests/packages/apt.pp
new file mode 100644
index 0000000..bd6fdca
--- /dev/null
+++ b/modules/contint/manifests/packages/apt.pp
@@ -0,0 +1,29 @@
+# === Class contint::packages::apt
+#
+# Apt configuration needed for contint hosts
+#
+class contint::packages::apt {
+ class { 'apt::unattendedupgrades':
+ ensure => absent,
+ }
+
+ apt::conf { 'unattended-upgrades-wikimedia':
+ ensure => absent,
+ priority => '51',
+ key => 'Unattended-Upgrade::Allowed-Origins',
+ # lint:ignore:single_quote_string_with_variables
+ value => 'Wikimedia:${distro_codename}-wikimedia',
+ # lint:endignore
+ }
+ apt::conf { 'lower-periodic-randomsleep':
+ ensure => absent,
+ priority => '51',
+ key => 'APT::Periodic::RandomSleep',
+ value => '300',
+ }
+
+ # Not meant to run hourly :/
+ file { '/etc/cron.hourly/apt':
+ ensure => absent,
+ }
+}
diff --git a/modules/contint/manifests/packages/labs.pp
b/modules/contint/manifests/packages/labs.pp
index 1fc3292..3b11a55 100644
--- a/modules/contint/manifests/packages/labs.pp
+++ b/modules/contint/manifests/packages/labs.pp
@@ -5,6 +5,8 @@
Package['puppet-lint'] -> Class['contint::packages::labs']
+ require contint::packages::apt
+
include contint::packages
# Fonts needed for browser tests screenshots (T71535)
include mediawiki::packages::fonts
@@ -12,29 +14,6 @@
# Required for python testing
include ::contint::packages::python
- class { 'apt::unattendedupgrades':
- ensure => absent,
- }
-
- apt::conf { 'unattended-upgrades-wikimedia':
- ensure => absent,
- priority => '51',
- key => 'Unattended-Upgrade::Allowed-Origins',
- # lint:ignore:single_quote_string_with_variables
- value => 'Wikimedia:${distro_codename}-wikimedia',
- # lint:endignore
- }
- apt::conf { 'lower-periodic-randomsleep':
- ensure => absent,
- priority => '51',
- key => 'APT::Periodic::RandomSleep',
- value => '300',
- }
-
- # Not meant to run hourly :/
- file { '/etc/cron.hourly/apt':
- ensure => absent,
- }
# Shell script wrappers to ease package building
# Package generated via the mirror operations/debs/jenkins-debian-glue.git
--
To view, visit https://gerrit.wikimedia.org/r/226712
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a40fb865904c09244eb10bce7f292fdcbe8101a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
