opendev
/
puppet-mediawiki
Code Issues Proposed changes

Merge "Stick to REL1_27 on Trusty, not master"

This commit is contained in:
Jenkins 2016-08-19 03:38:51 +00:00 committed by Gerrit Code Review
parent bbf120e47e 6f874ca228
commit f7fc800421
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/app.pp
View File

@ -1,17 +1,21 @@
# Class: mediawiki::app # Class: mediawiki::app
# #
class mediawiki::app { class mediawiki::app {
$revision = $::lsbdistcodename ? {
'precise' => 'origin/master', # madness
'trusty' => 'origin/REL1_27',
}
vcsrepo { '/srv/mediawiki/w': vcsrepo { '/srv/mediawiki/w':
ensure => present, ensure => present,
provider => git, provider => git,
source => 'https://gerrit.wikimedia.org/r/p/mediawiki/core.git', source => 'https://gerrit.wikimedia.org/r/p/mediawiki/core.git',
revision => 'origin/master', # TODO: This is madness. revision => $revision,
} }
vcsrepo { '/srv/mediawiki/w/vendor': vcsrepo { '/srv/mediawiki/w/vendor':
ensure => present, ensure => present,
provider => git, provider => git,
source => 'https://gerrit.wikimedia.org/r/p/mediawiki/vendor.git', source => 'https://gerrit.wikimedia.org/r/p/mediawiki/vendor.git',
revision => 'origin/master', # TODO: No. revision => $revision,
} }
} }