Arturo Borrero Gonzalez has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/389480 )
Change subject: apt: unattended upgrades for wikimedia packages by default
......................................................................
apt: unattended upgrades for wikimedia packages by default
Include the required bits to get unattended upgrades for wikimedia packages
if using the apt::unattendedupgrades class.
We want wikimedia deb packages being upgraded by unattended-upgrades also in
labs machines, as it happens with the contint machines. To achieve this,
factor our the config into the common class apt::unattendedupgrades.
Note that the only users of this class right now are:
% git grep ::apt::unattendedupgrades
modules/contint/manifests/packages/apt.pp: include ::apt::unattendedupgrades
modules/profile/manifests/base/labs.pp: include ::apt::unattendedupgrades
In the future, if someone would like to use this class but don't get wikimedia
deb packages upgraded, we could add a parameter for the class to disable this.
Bug: T177920
Change-Id: I9ed2dd731fd2149bc5ae163213f1160b9efca056
Signed-off-by: Arturo Borrero Gonzalez <aborr...@wikimedia.org>
---
M modules/apt/manifests/unattendedupgrades.pp
M modules/contint/manifests/packages/apt.pp
2 files changed, 9 insertions(+), 9 deletions(-)
Approvals:
Arturo Borrero Gonzalez: Looks good to me, approved
Hashar: Looks good to me, but someone else must approve
Rush: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/apt/manifests/unattendedupgrades.pp
b/modules/apt/manifests/unattendedupgrades.pp
index bb056c5..20fb167 100644
--- a/modules/apt/manifests/unattendedupgrades.pp
+++ b/modules/apt/manifests/unattendedupgrades.pp
@@ -9,4 +9,13 @@
key => 'APT::Periodic::Unattended-Upgrade',
value => '1',
}
+
+ apt::conf { 'unattended-upgrades-wikimedia':
+ priority => '51',
+ # Key with trailing '::' to append to potentially existing entry
+ key => 'Unattended-Upgrade::Origins-Pattern::',
+ # lint:ignore:single_quote_string_with_variables
+ value => 'origin=Wikimedia,codename=${distro_codename}-wikimedia',
+ # lint:endignore
+ }
}
diff --git a/modules/contint/manifests/packages/apt.pp
b/modules/contint/manifests/packages/apt.pp
index 9c762cc..9b6567d 100644
--- a/modules/contint/manifests/packages/apt.pp
+++ b/modules/contint/manifests/packages/apt.pp
@@ -5,15 +5,6 @@
class contint::packages::apt {
include ::apt::unattendedupgrades
- apt::conf { 'unattended-upgrades-wikimedia':
- priority => '51',
- # Key with trailing '::' to append to potentially existing entry
- key => 'Unattended-Upgrade::Allowed-Origins::',
- # lint:ignore:single_quote_string_with_variables
- value => 'Wikimedia:${distro_codename}-wikimedia',
- # lint:endignore
- }
-
if os_version('debian == jessie') {
# Sanity check: only enable in labs
requires_realm('labs')
--
To view, visit https://gerrit.wikimedia.org/r/389480
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9ed2dd731fd2149bc5ae163213f1160b9efca056
Gerrit-PatchSet: 9
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Arturo Borrero Gonzalez <aborr...@wikimedia.org>
Gerrit-Reviewer: Arturo Borrero Gonzalez <aborr...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Rush <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
