Muehlenhoff has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/378964 )
Change subject: Remove hack configuring eventlogging/eventlogging to use
trebuchet
......................................................................
Remove hack configuring eventlogging/eventlogging to use trebuchet
The referenced Phab task T118772 got declined, so this can be removed
as well.
Change-Id: Id572352d6c2959fb2c333614c9d51975b5ba7776
---
M modules/eventlogging/manifests/init.pp
1 file changed, 0 insertions(+), 13 deletions(-)
Approvals:
Krinkle: Looks good to me, but someone else must approve
Muehlenhoff: Looks good to me, approved
Ottomata: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/eventlogging/manifests/init.pp
b/modules/eventlogging/manifests/init.pp
index 7a18f71..30f1423 100644
--- a/modules/eventlogging/manifests/init.pp
+++ b/modules/eventlogging/manifests/init.pp
@@ -1,7 +1,5 @@
# == Class eventlogging
#
-# TODO: Implement the following as part of T118772:
-#
# Currently, this class only installs EventLogging dependencies
# and ensures that an unmanaged cloned at /usr/local/src/eventlogging
# exists. If you want to update eventlogging code, you must manually
@@ -9,15 +7,4 @@
#
class eventlogging {
include ::eventlogging::dependencies
-
- # TEMPORARY HACK!!!
- # TODO: use scap everywhere: T118772
- # This conditional only exists so as not to conflict with
- # the scap Jessie deployment of eventlogging-service-eventbus.
- # Once we use scap, we might be able to remove this.
- if $::operatingsystem == 'Ubuntu' or $::hostname == 'hafnium' {
- package { 'eventlogging/eventlogging':
- provider => 'trebuchet',
- }
- }
}
--
To view, visit https://gerrit.wikimedia.org/r/378964
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id572352d6c2959fb2c333614c9d51975b5ba7776
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
