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: I4e6b0df76c0e1b1e9faa9e8884a78ab1e9ab38d7
This commit is contained in:
parent
75d3516b37
commit
e434cf7d15
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
|
@ -37,7 +37,7 @@ class nodepool (
|
||||
) {
|
||||
|
||||
|
||||
class { 'mysql::server':
|
||||
class { '::mysql::server':
|
||||
config_hash => {
|
||||
'root_password' => $mysql_root_password,
|
||||
'default_engine' => 'InnoDB',
|
||||
@ -45,8 +45,8 @@ class nodepool (
|
||||
}
|
||||
}
|
||||
|
||||
include mysql::server::account_security
|
||||
include mysql::python
|
||||
include ::mysql::server::account_security
|
||||
include ::mysql::python
|
||||
|
||||
mysql::db { 'nodepool':
|
||||
user => 'nodepool',
|
||||
@ -102,9 +102,9 @@ class nodepool (
|
||||
source => $git_source_repo,
|
||||
}
|
||||
|
||||
include diskimage_builder
|
||||
include ::diskimage_builder
|
||||
|
||||
include pip
|
||||
include ::pip
|
||||
exec { 'install_nodepool' :
|
||||
command => 'pip install -U /opt/nodepool',
|
||||
path => '/usr/local/bin:/usr/bin:/bin/',
|
||||
@ -280,11 +280,11 @@ class nodepool (
|
||||
|
||||
if $image_log_document_root != '/var/log/nodepool' {
|
||||
file { $image_log_document_root:
|
||||
ensure => directory,
|
||||
mode => '0755',
|
||||
owner => 'nodepool',
|
||||
group => 'nodepool',
|
||||
require => [
|
||||
ensure => directory,
|
||||
mode => '0755',
|
||||
owner => 'nodepool',
|
||||
group => 'nodepool',
|
||||
require => [
|
||||
User['nodepool'],
|
||||
File['/var/log/nodepool'],
|
||||
],
|
||||
|
Loading…
x
Reference in New Issue
Block a user