Browse Source

Add Gemfile and puppet 4 checks

In anticipation of puppet 4, start trying to deal with puppet 4 things
that can be helpfully predicted by puppet lint plugins. Also fix lint
errors caught by the puppet-lint-absolute_classname-check gem.

Change-Id: I362a59e1bb7fd57baf4714c6155db530eef652ea
changes/79/209279/1
Colleen Murphy 6 years ago
parent
commit
0e00b2e644
  1. 2
      .gitignore
  2. 30
      Gemfile
  3. 2
      manifests/image_scaler.pp
  4. 10
      manifests/init.pp

2
.gitignore

@ -0,0 +1,2 @@
Gemfile.lock
.bundled_gems/

30
Gemfile

@ -0,0 +1,30 @@
source 'https://rubygems.org'
group :development, :test do
gem 'puppetlabs_spec_helper', :require => false
gem 'metadata-json-lint'
# This is nice and all, but let's not worry about it until we've actually
# got puppet 4.x sorted
# gem 'puppet-lint-param-docs'
gem 'puppet-lint-absolute_classname-check'
gem 'puppet-lint-absolute_template_path'
gem 'puppet-lint-trailing_newline-check'
# Puppet 4.x related lint checks
gem 'puppet-lint-unquoted_string-check'
gem 'puppet-lint-empty_string-check'
gem 'puppet-lint-leading_zero-check'
gem 'puppet-lint-variable_contains_upcase'
gem 'puppet-lint-spaceship_operator_without_tag-check'
gem 'puppet-lint-undef_in_function-check'
if puppetversion = ENV['PUPPET_GEM_VERSION']
gem 'puppet', puppetversion, :require => false
else
gem 'puppet', '~> 3.0', :require => false
end
end
# vim:ft=ruby

2
manifests/image_scaler.pp

@ -56,5 +56,5 @@ class mediawiki::image_scaler {
'xfonts-scalable']:
ensure => present,
}
include tmpreaper
include ::tmpreaper
}

10
manifests/init.pp

@ -21,8 +21,8 @@ class mediawiki(
}
include ::httpd
include mediawiki::php
include mediawiki::app
include ::mediawiki::php
include ::mediawiki::app
package { ['libapache2-mod-php5',
'lua5.2']:
@ -76,9 +76,9 @@ class mediawiki(
}
}
if ($role == 'image-scaler' or $role == 'all') {
include mediawiki::image_scaler
include mediawiki::php
include mediawiki::app
include ::mediawiki::image_scaler
include ::mediawiki::php
include ::mediawiki::app
}
}

Loading…
Cancel
Save