Ori.livneh has submitted this change and it was merged.
Change subject: Drop stub role::mediawiki::maintenance class
......................................................................
Drop stub role::mediawiki::maintenance class
At this point it's nothing more than an alias of role::mediawiki::common, so
just update references to point to common instead.
Change-Id: I10a4629021ac862de88dc951cb505b84e90197c4
---
M manifests/role/mediawiki.pp
M manifests/site.pp
2 files changed, 2 insertions(+), 9 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index 6aacc3c..92c4e22 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -253,11 +253,4 @@
onlyif => '/etc/init.d/apache2 status',
}
}
-
- # Class for servers which run MW maintenance scripts.
- # Maintenance servers are sometimes dual-purpose with misc apache, so the
- # apache service installed by wikimedia-task-appserver is not disabled
here.
- class maintenance {
- include role::mediawiki::common
- }
}
diff --git a/manifests/site.pp b/manifests/site.pp
index dcc17bc..2ba70b7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1072,7 +1072,7 @@
}
include base
- include role::mediawiki::maintenance
+ include role::mediawiki::common
include sudo::appserver
include subversion::client
include nfs::netapp::home
@@ -2587,7 +2587,7 @@
}
node 'terbium.eqiad.wmnet' {
- include role::mediawiki::maintenance
+ include role::mediawiki::common
include role::db::maintenance
include misc::monitoring::jobqueue
include admins::roots
--
To view, visit https://gerrit.wikimedia.org/r/136119
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I10a4629021ac862de88dc951cb505b84e90197c4
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Chasemp <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Rush <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
