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 not caught before. Change-Id: I6ee8cc21247258d9a37ce3304c207c4b637378f7
This commit is contained in:
parent
0563885683
commit
ce4349d156
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
Gemfile.lock
|
||||
.bundled_gems/
|
30
Gemfile
Normal file
30
Gemfile
Normal 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
|
@ -16,16 +16,16 @@ class jeepyb::fetch_remotes(
|
||||
) {
|
||||
validate_array($log_options)
|
||||
|
||||
include jeepyb
|
||||
include ::jeepyb
|
||||
|
||||
cron { 'jeepyb_gerritfetchremotes':
|
||||
ensure => $ensure,
|
||||
user => $user,
|
||||
minute => $minute,
|
||||
command => "sleep $((RANDOM\%60+90)) && /usr/local/bin/manage-projects -v >> ${logfile} 2>&1",
|
||||
ensure => $ensure,
|
||||
user => $user,
|
||||
minute => $minute,
|
||||
command => "sleep $((RANDOM\%60+90)) && /usr/local/bin/manage-projects -v >> ${logfile} 2>&1",
|
||||
}
|
||||
|
||||
include logrotate
|
||||
include ::logrotate
|
||||
logrotate::file { $logfile:
|
||||
log => $logfile,
|
||||
options => $log_options,
|
||||
|
@ -4,7 +4,7 @@ class jeepyb (
|
||||
$git_source_repo = 'https://git.openstack.org/openstack-infra/jeepyb',
|
||||
$git_revision = 'master',
|
||||
) {
|
||||
include mysql::python
|
||||
include ::mysql::python
|
||||
|
||||
if ! defined(Package['python-paramiko']) {
|
||||
package { 'python-paramiko':
|
||||
|
@ -14,7 +14,7 @@ class jeepyb::manage_projects(
|
||||
) {
|
||||
validate_array($log_options)
|
||||
|
||||
include jeepyb
|
||||
include ::jeepyb
|
||||
|
||||
exec { 'jeepyb_manage_projects':
|
||||
command => "/usr/local/bin/manage-projects -v >> ${logfile} 2>&1",
|
||||
@ -23,7 +23,7 @@ class jeepyb::manage_projects(
|
||||
logoutput => true,
|
||||
}
|
||||
|
||||
include logrotate
|
||||
include ::logrotate
|
||||
logrotate::file { $logfile:
|
||||
log => $logfile,
|
||||
options => $log_options,
|
||||
|
@ -12,7 +12,7 @@ class jeepyb::openstackwatch(
|
||||
$minute = '18',
|
||||
$hour = '*',
|
||||
) {
|
||||
include jeepyb
|
||||
include ::jeepyb
|
||||
|
||||
group { 'openstackwatch':
|
||||
ensure => present,
|
||||
|
Loading…
Reference in New Issue
Block a user