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 and puppet-lint-empty_string-check as well as arrow alignment errors now caught by the bundle-installed puppet-lint gem. The $description parameter was changed from defaulting to empty string to defaulting to undef. The yumrepo resource behaves the same either way. Change-Id: If5a649068f73218a98372846ba38d2c25820c78a
This commit is contained in:
parent
35d52404ec
commit
8d5fd86231
|
@ -1,2 +1,4 @@
|
|||
*.swp
|
||||
pkg
|
||||
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
|
|
@ -23,10 +23,10 @@ class yum (
|
|||
}
|
||||
|
||||
file { $repos_dir:
|
||||
ensure => directory,
|
||||
mode => '0755',
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
ensure => directory,
|
||||
mode => '0755',
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -18,7 +18,7 @@ class yum::mirror (
|
|||
$vhost_name = $::fqdn,
|
||||
) {
|
||||
|
||||
include yum
|
||||
include ::yum
|
||||
include ::httpd
|
||||
|
||||
::httpd::vhost { $vhost_name:
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
# Class: yum::repo
|
||||
#
|
||||
define yum::repo (
|
||||
$description = '',
|
||||
$description = undef,
|
||||
$url_path = false,
|
||||
$enabled = 0,
|
||||
$gpgcheck = 0,
|
||||
|
@ -25,15 +25,15 @@ define yum::repo (
|
|||
$cron_minute = 0,
|
||||
) {
|
||||
|
||||
include 'yum'
|
||||
include ::yum
|
||||
|
||||
yumrepo { $name:
|
||||
name => $name,
|
||||
descr => $description,
|
||||
enabled => $enabled,
|
||||
gpgcheck => $gpgcheck,
|
||||
baseurl => $baseurl,
|
||||
mirrorlist => $mirrorlist,
|
||||
name => $name,
|
||||
descr => $description,
|
||||
enabled => $enabled,
|
||||
gpgcheck => $gpgcheck,
|
||||
baseurl => $baseurl,
|
||||
mirrorlist => $mirrorlist,
|
||||
}
|
||||
|
||||
cron { "reposync ${name}":
|
||||
|
|
Loading…
Reference in New Issue