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:
parent
4e26cb34df
commit
237aa40927
|
@ -0,0 +1,2 @@
|
||||||
|
Gemfile.lock
|
||||||
|
.bundled_gems/
|
|
@ -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
|
|
@ -17,14 +17,14 @@
|
||||||
#
|
#
|
||||||
class subunit2sql (
|
class subunit2sql (
|
||||||
) {
|
) {
|
||||||
include pip
|
include ::pip
|
||||||
|
|
||||||
package {'python-mysqldb':
|
package {'python-mysqldb':
|
||||||
ensure => present,
|
ensure => present,
|
||||||
}
|
}
|
||||||
|
|
||||||
package {'python-psycopg2':
|
package {'python-psycopg2':
|
||||||
ensure => present,
|
ensure => present,
|
||||||
}
|
}
|
||||||
|
|
||||||
package { 'python-subunit':
|
package { 'python-subunit':
|
||||||
|
|
|
@ -68,19 +68,19 @@ define subunit2sql::worker (
|
||||||
}
|
}
|
||||||
|
|
||||||
service { "jenkins-subunit-worker${suffix}":
|
service { "jenkins-subunit-worker${suffix}":
|
||||||
enable => true,
|
enable => true,
|
||||||
hasrestart => true,
|
hasrestart => true,
|
||||||
subscribe => [
|
subscribe => [
|
||||||
File["/etc/logstash/jenkins-subunit-worker${suffix}.yaml"],
|
File["/etc/logstash/jenkins-subunit-worker${suffix}.yaml"],
|
||||||
Package['subunit2sql'],
|
Package['subunit2sql'],
|
||||||
],
|
],
|
||||||
require => [
|
require => [
|
||||||
File['/etc/logstash'],
|
File['/etc/logstash'],
|
||||||
File["/etc/init.d/jenkins-subunit-worker${suffix}"],
|
File["/etc/init.d/jenkins-subunit-worker${suffix}"],
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|
||||||
include logrotate
|
include ::logrotate
|
||||||
logrotate::file { "subunit-worker${suffix}-debug.log":
|
logrotate::file { "subunit-worker${suffix}-debug.log":
|
||||||
log => "/var/log/logstash/subunit-worker${suffix}-debug.log",
|
log => "/var/log/logstash/subunit-worker${suffix}-debug.log",
|
||||||
options => [
|
options => [
|
||||||
|
|
Loading…
Reference in New Issue