Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/132121
Change subject: Remove dependency on mediawiki::packages from mediawiki::sync
......................................................................
Remove dependency on mediawiki::packages from mediawiki::sync
Move the dependency from mediawiki::sync to applicationserver::service.
In production, mediawiki::packages only provisions wikimedia-app-taskserver,
which is no longer required anyway.
Change-Id: I2dfa0b593d0933a357763dad3a890e410847e482
---
M modules/applicationserver/manifests/service.pp
M modules/mediawiki/manifests/sync.pp
2 files changed, 2 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/21/132121/1
diff --git a/modules/applicationserver/manifests/service.pp
b/modules/applicationserver/manifests/service.pp
index c231471..8be4c00 100644
--- a/modules/applicationserver/manifests/service.pp
+++ b/modules/applicationserver/manifests/service.pp
@@ -4,6 +4,7 @@
Class['applicationserver::apache_packages'] ->
Class['applicationserver::service']
Class['applicationserver::config::base'] ->
Class['applicationserver::service']
include mediawiki::sync
+ include mediawiki::packages
# Start apache but not at boot
service { 'apache':
diff --git a/modules/mediawiki/manifests/sync.pp
b/modules/mediawiki/manifests/sync.pp
index 8c58e2d..a5083fb 100644
--- a/modules/mediawiki/manifests/sync.pp
+++ b/modules/mediawiki/manifests/sync.pp
@@ -1,10 +1,7 @@
# mediawiki syncing class
class mediawiki::sync {
-
include misc::deployment::vars
-
- require mediawiki::packages
- require mediawiki::users::l10nupdate
+ include mediawiki::users::l10nupdate
deployment::target { 'scap': }
--
To view, visit https://gerrit.wikimedia.org/r/132121
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2dfa0b593d0933a357763dad3a890e410847e482
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
