ArielGlenn has submitted this change and it was merged.
Change subject: beta: fix mediawiki dependency
......................................................................
beta: fix mediawiki dependency
(File[/usr/local/apache] => Package[wikimedia-task-appserver] =>
Class[Mediawiki::Packages] => Class[Mediawiki::Sync] =>
File[/usr/local/apache])
We can not require the package and require a file that should be done
before the package. Instead, create the file directly in the package
class, that make sense since both the file and package are used to
create /usr/local/apache/.
Change-Id: I88bad8d686a1d8ebc8a0e3683c3d34e0ae335a75
---
M modules/mediawiki/manifests/packages.pp
M modules/mediawiki/manifests/sync.pp
2 files changed, 11 insertions(+), 10 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki/manifests/packages.pp
b/modules/mediawiki/manifests/packages.pp
index 8a24793..782a703 100644
--- a/modules/mediawiki/manifests/packages.pp
+++ b/modules/mediawiki/manifests/packages.pp
@@ -1,5 +1,16 @@
# mediawiki package class
class mediawiki::packages {
+
+ if $::realm == 'labs' {
+ file { '/usr/local/apache':
+ ensure => link,
+ target => '/data/project/apache',
+ # Create link before wikimedia-task-appserver attempts
+ # to create /usr/local/apache/common.
+ before => Package['wikimedia-task-appserver'],
+ }
+ }
+
package { [ 'wikimedia-task-appserver', 'twemproxy' ]:
ensure => latest;
}
diff --git a/modules/mediawiki/manifests/sync.pp
b/modules/mediawiki/manifests/sync.pp
index f50db36..c415bb6 100644
--- a/modules/mediawiki/manifests/sync.pp
+++ b/modules/mediawiki/manifests/sync.pp
@@ -4,16 +4,6 @@
require mediawiki::packages
require mediawiki::users::l10nupdate
- if $::realm == 'labs' {
- file { '/usr/local/apache':
- ensure => link,
- target => '/data/project/apache',
- # Create link before wikimedia-task-appserver attempts
- # to create /usr/local/apache/common.
- before => Package['wikimedia-task-appserver'],
- }
- }
-
$scriptpath = "/usr/local/bin"
file {
--
To view, visit https://gerrit.wikimedia.org/r/64065
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I88bad8d686a1d8ebc8a0e3683c3d34e0ae335a75
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
