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 check as well as arrow alignment errors that were not being caught by the system-installed version of puppet-lint before. Change-Id: I4d7d5c89efe4bc95ea9f915bee89eb0d9d069106
This commit is contained in:
parent
1011fa43f0
commit
c54d2e16cb
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
|
@ -8,11 +8,11 @@ class openafs::client (
|
||||
$cache_size = 500000,
|
||||
) {
|
||||
|
||||
include ntp
|
||||
class { 'kerberos::client':
|
||||
realm => $realm,
|
||||
kdcs => $kdcs,
|
||||
admin_server => $admin_server,
|
||||
include ::ntp
|
||||
class { '::kerberos::client':
|
||||
realm => $realm,
|
||||
kdcs => $kdcs,
|
||||
admin_server => $admin_server,
|
||||
}
|
||||
|
||||
$packages = [
|
||||
@ -20,7 +20,7 @@ class openafs::client (
|
||||
'openafs-krb5',
|
||||
]
|
||||
package { $packages:
|
||||
ensure => present,
|
||||
ensure => present,
|
||||
}
|
||||
|
||||
if ($::osfamily == 'RedHat') {
|
||||
@ -110,8 +110,8 @@ class openafs::client (
|
||||
}
|
||||
|
||||
service { 'openafs-client':
|
||||
ensure => running,
|
||||
require => [
|
||||
ensure => running,
|
||||
require => [
|
||||
File["${openafs_path}/CellServDB"],
|
||||
],
|
||||
}
|
||||
|
@ -33,8 +33,8 @@ class openafs::fileserver (
|
||||
|
||||
# yes, this belongs here. the fileserver service runs bosserver
|
||||
service { 'openafs-fileserver':
|
||||
ensure => running,
|
||||
require => [
|
||||
ensure => running,
|
||||
require => [
|
||||
File['/etc/openafs/server/CellServDB'],
|
||||
Package['openafs-fileserver'],
|
||||
],
|
||||
|
Loading…
x
Reference in New Issue
Block a user