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 as well
as arrow alignment errors caught by the now bundle-installed
puppet-lint.

Change-Id: I6975c605e238046b3812b2fea20e65db8c890e42
This commit is contained in:
Colleen Murphy 2015-08-13 18:37:04 -07:00
parent 4e26cb34df
commit 237aa40927
4 changed files with 40 additions and 8 deletions

2
.gitignore vendored Normal file
View File

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

30
Gemfile Normal file
View File

@ -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

View File

@ -17,14 +17,14 @@
#
class subunit2sql (
) {
include pip
include ::pip
package {'python-mysqldb':
ensure => present,
ensure => present,
}
package {'python-psycopg2':
ensure => present,
ensure => present,
}
package { 'python-subunit':

View File

@ -68,19 +68,19 @@ define subunit2sql::worker (
}
service { "jenkins-subunit-worker${suffix}":
enable => true,
hasrestart => true,
subscribe => [
enable => true,
hasrestart => true,
subscribe => [
File["/etc/logstash/jenkins-subunit-worker${suffix}.yaml"],
Package['subunit2sql'],
],
require => [
require => [
File['/etc/logstash'],
File["/etc/init.d/jenkins-subunit-worker${suffix}"],
],
}
include logrotate
include ::logrotate
logrotate::file { "subunit-worker${suffix}-debug.log":
log => "/var/log/logstash/subunit-worker${suffix}-debug.log",
options => [