Alexandros Kosiaris has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/353120 )
Change subject: thumbor: move 'include standard' to role
......................................................................
thumbor: move 'include standard' to role
Change-Id: I4a6b2e0a275ce517911288e350d0acc34322b53a
---
M manifests/site.pp
M modules/role/manifests/thumbor/mediawiki.pp
2 files changed, 1 insertion(+), 2 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 089f1f0..5faec77 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2657,8 +2657,6 @@
# Thumbor servers for MediaWiki image scaling
node /^thumbor100[12].eqiad.wmnet/ {
role(thumbor::mediawiki)
-
- include ::standard
}
# deployment servers
diff --git a/modules/role/manifests/thumbor/mediawiki.pp
b/modules/role/manifests/thumbor/mediawiki.pp
index 3c99af2..8f021a2 100644
--- a/modules/role/manifests/thumbor/mediawiki.pp
+++ b/modules/role/manifests/thumbor/mediawiki.pp
@@ -5,6 +5,7 @@
# filtertags: labs-project-deployment-prep
class role::thumbor::mediawiki {
+ include ::standard
include ::base::firewall
include role::statsite
--
To view, visit https://gerrit.wikimedia.org/r/353120
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4a6b2e0a275ce517911288e350d0acc34322b53a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
