Merge "Add Gemfile and puppet 4 checks"
This commit is contained in:
commit
b44f64e7a0
|
@ -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
|
|
@ -29,7 +29,7 @@ class graphite(
|
|||
'nodejs' ]
|
||||
|
||||
include ::httpd
|
||||
include pip
|
||||
include ::pip
|
||||
|
||||
include ::httpd::mod::wsgi
|
||||
|
||||
|
@ -145,7 +145,7 @@ class graphite(
|
|||
require => File['/var/log/graphite'],
|
||||
}
|
||||
|
||||
include logrotate
|
||||
include ::logrotate
|
||||
logrotate::file { 'querylog':
|
||||
log => '/var/log/graphite/carbon-cache-a/query.log',
|
||||
options => [
|
||||
|
@ -258,8 +258,8 @@ class graphite(
|
|||
}
|
||||
|
||||
file { '/usr/local/bin/graphite-init-db.py':
|
||||
mode => '0555',
|
||||
source => 'puppet:///modules/graphite/graphite-init-db.py'
|
||||
mode => '0555',
|
||||
source => 'puppet:///modules/graphite/graphite-init-db.py'
|
||||
}
|
||||
|
||||
file { '/etc/graphite/admin.ini':
|
||||
|
@ -272,18 +272,18 @@ class graphite(
|
|||
}
|
||||
|
||||
file { '/etc/init.d/carbon-cache':
|
||||
mode => '0555',
|
||||
source => 'puppet:///modules/graphite/carbon-cache.init'
|
||||
mode => '0555',
|
||||
source => 'puppet:///modules/graphite/carbon-cache.init'
|
||||
}
|
||||
|
||||
file { '/etc/init.d/statsd':
|
||||
mode => '0555',
|
||||
source => 'puppet:///modules/graphite/statsd.init'
|
||||
mode => '0555',
|
||||
source => 'puppet:///modules/graphite/statsd.init'
|
||||
}
|
||||
|
||||
file { '/etc/default/statsd':
|
||||
mode => '0444',
|
||||
source => 'puppet:///modules/graphite/statsd.default'
|
||||
mode => '0444',
|
||||
source => 'puppet:///modules/graphite/statsd.default'
|
||||
}
|
||||
|
||||
service { 'carbon-cache':
|
||||
|
|
Loading…
Reference in New Issue