Add Gemfile and puppet 4 checks + fix lint errors
In anticipation of puppet 4, start trying to deal with puppet 4 things that can be helpfully predicted by puppet lint plugins. This patch also fixes lint errors caught by the puppet-lint-absolute_classname-check gem. It removes a duplicate inclusion of the logrotate class rather than fixing its namespace issue. Change-Id: I263b8a80a18bc2607d547caac7e8587e2e4dd5ea
This commit is contained in:
parent
edb1dddb15
commit
e250447f72
|
@ -0,0 +1,2 @@
|
|||
Gemfile.lock
|
||||
.bundled_gems/
|
|
@ -0,0 +1,31 @@
|
|||
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-numericvariable'
|
||||
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
|
|
@ -5,8 +5,8 @@ class ansible (
|
|||
$ansible_roles_path = '/etc/ansible/roles'
|
||||
) {
|
||||
|
||||
include logrotate
|
||||
include pip
|
||||
include ::logrotate
|
||||
include ::pip
|
||||
|
||||
package { 'ansible':
|
||||
ensure => latest,
|
||||
|
@ -36,8 +36,7 @@ class ansible (
|
|||
source => 'puppet:///modules/ansible/puppet-inventory',
|
||||
}
|
||||
|
||||
include logrotate
|
||||
logrotate::file { 'ansible':
|
||||
::logrotate::file { 'ansible':
|
||||
log => '/var/log/ansible.log',
|
||||
options => [
|
||||
'compress',
|
||||
|
|
Loading…
Reference in New Issue