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

Change-Id: I4a6d4a6ecfc9812145867362eb06228de0c840bc
This commit is contained in:
Colleen Murphy 2015-08-14 11:05:41 -07:00
parent 7c40c4ed58
commit 944afc1acd
3 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

@ -25,10 +25,10 @@ class unbound (
# This file differs from that in the package only by setting
# RESOLVCONF_FORWARDERS to false.
file { '/etc/default/unbound':
source => 'puppet:///modules/unbound/unbound.default',
owner => 'root',
group => 'root',
mode => '0444',
source => 'puppet:///modules/unbound/unbound.default',
owner => 'root',
group => 'root',
mode => '0444',
}
# We require the defaults file be in place before installing the
@ -43,10 +43,10 @@ class unbound (
# Tripleo uses dhcp
file { '/etc/dhcp/dhclient.conf':
source => 'puppet:///modules/unbound/dhclient.conf.debian',
owner => 'root',
group => 'root',
mode => '0444',
source => 'puppet:///modules/unbound/dhclient.conf.debian',
owner => 'root',
group => 'root',
mode => '0444',
}
}