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 errors caught by the puppet-lint-absolute_classname-check gem and arrow alignment errors that weren't being caught before. This patch leaves the puppet-lint-empty_string-check commented out for now since there are too many parameters with empty string defaults. Change-Id: I0b8cf61bd71f7875b9741fff78aef40c5bc513bd
This commit is contained in:
parent
a86f6cba2a
commit
bb7f21a4d8
|
@ -0,0 +1,2 @@
|
|||
Gemfile.lock
|
||||
.bundled_gems/
|
|
@ -0,0 +1,32 @@
|
|||
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'
|
||||
#The puppet-gerrit module makes too much use of empty string defaults
|
||||
#so disable this check for now
|
||||
#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
|
|
@ -12,13 +12,13 @@ class gerrit::cron {
|
|||
}
|
||||
|
||||
cron { 'expireoldreviews':
|
||||
ensure => 'absent',
|
||||
user => 'gerrit2',
|
||||
ensure => 'absent',
|
||||
user => 'gerrit2',
|
||||
}
|
||||
|
||||
cron { 'removedbdumps':
|
||||
ensure => 'absent',
|
||||
user => 'gerrit2',
|
||||
ensure => 'absent',
|
||||
user => 'gerrit2',
|
||||
}
|
||||
|
||||
cron { 'clear_gerrit_logs':
|
||||
|
|
|
@ -161,8 +161,8 @@ class gerrit(
|
|||
$enable_javamelody_top_menu = false,
|
||||
) {
|
||||
include ::httpd
|
||||
include jeepyb
|
||||
include pip
|
||||
include ::jeepyb
|
||||
include ::pip
|
||||
|
||||
$java_home = $::lsbdistcodename ? {
|
||||
'precise' => '/usr/lib/jvm/java-7-openjdk-amd64/jre',
|
||||
|
@ -180,7 +180,7 @@ class gerrit(
|
|||
$gerrit_war = '/home/gerrit2/review_site/bin/gerrit.war'
|
||||
$gerrit_site = '/home/gerrit2/review_site'
|
||||
|
||||
include gerrit::user
|
||||
include ::gerrit::user
|
||||
|
||||
if ($gitweb) {
|
||||
package { 'gitweb':
|
||||
|
@ -408,11 +408,11 @@ class gerrit(
|
|||
|
||||
if $robots_txt_source != '' {
|
||||
file { '/home/gerrit2/review_site/static/robots.txt':
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0444',
|
||||
source => $robots_txt_source,
|
||||
require => File['/home/gerrit2/review_site/static'],
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0444',
|
||||
source => $robots_txt_source,
|
||||
require => File['/home/gerrit2/review_site/static'],
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -672,10 +672,10 @@ class gerrit(
|
|||
ensure => present,
|
||||
}
|
||||
file { '/home/gerrit2/review_site/lib/mysql-connector-java.jar':
|
||||
ensure => link,
|
||||
target => '/usr/share/java/mysql-connector-java.jar',
|
||||
before => Exec['gerrit-start'],
|
||||
require => [
|
||||
ensure => link,
|
||||
target => '/usr/share/java/mysql-connector-java.jar',
|
||||
before => Exec['gerrit-start'],
|
||||
require => [
|
||||
Package['libmysql-java'],
|
||||
File['/home/gerrit2/review_site/lib'],
|
||||
],
|
||||
|
@ -730,10 +730,10 @@ class gerrit(
|
|||
ensure => present,
|
||||
}
|
||||
file { '/home/gerrit2/review_site/lib/bcpkix.jar':
|
||||
ensure => link,
|
||||
target => '/usr/share/java/bcpkix.jar',
|
||||
before => Exec['gerrit-start'],
|
||||
require => [
|
||||
ensure => link,
|
||||
target => '/usr/share/java/bcpkix.jar',
|
||||
before => Exec['gerrit-start'],
|
||||
require => [
|
||||
Package['libbcpkix-java'],
|
||||
File['/home/gerrit2/review_site/lib'],
|
||||
],
|
||||
|
@ -756,10 +756,10 @@ class gerrit(
|
|||
ensure => present,
|
||||
}
|
||||
file { '/home/gerrit2/review_site/lib/bcpg.jar':
|
||||
ensure => link,
|
||||
target => '/usr/share/java/bcpg.jar',
|
||||
before => Exec['gerrit-start'],
|
||||
require => [
|
||||
ensure => link,
|
||||
target => '/usr/share/java/bcpg.jar',
|
||||
before => Exec['gerrit-start'],
|
||||
require => [
|
||||
Package['libbcpg-java'],
|
||||
File['/home/gerrit2/review_site/lib'],
|
||||
],
|
||||
|
|
|
@ -7,14 +7,14 @@ class gerrit::mysql(
|
|||
$database_password = '',
|
||||
) {
|
||||
|
||||
class { 'mysql::server':
|
||||
class { '::mysql::server':
|
||||
config_hash => {
|
||||
'root_password' => $mysql_root_password,
|
||||
'default_engine' => 'InnoDB',
|
||||
'bind_address' => '127.0.0.1',
|
||||
}
|
||||
}
|
||||
include mysql::server::account_security
|
||||
include ::mysql::server::account_security
|
||||
|
||||
mysql::db { $database_name:
|
||||
user => $database_user,
|
||||
|
|
|
@ -27,7 +27,7 @@ define gerrit::plugin(
|
|||
$plugin_parent_dir = '/home/gerrit2/review_site'
|
||||
$base_url = "http://tarballs.openstack.org/ci/gerrit/plugins/${name}"
|
||||
|
||||
include gerrit::user
|
||||
include ::gerrit::user
|
||||
|
||||
# This directory is used to download and cache gerrit plugin files.
|
||||
# That way the download and install steps are kept separate.
|
||||
|
@ -68,11 +68,11 @@ define gerrit::plugin(
|
|||
}
|
||||
|
||||
exec { "install-${base_plugin}":
|
||||
command => "cp ${plugin_cache_dir}/${plugin} ${plugin_dir}/${base_plugin}",
|
||||
path => ['/bin','/usr/bin', '/usr/sbin', '/usr/local/bin'],
|
||||
require => Exec["download-${plugin}"],
|
||||
user => 'gerrit2',
|
||||
unless => "test -f ${plugin_dir}/${base_plugin}",
|
||||
command => "cp ${plugin_cache_dir}/${plugin} ${plugin_dir}/${base_plugin}",
|
||||
path => ['/bin','/usr/bin', '/usr/sbin', '/usr/local/bin'],
|
||||
require => Exec["download-${plugin}"],
|
||||
user => 'gerrit2',
|
||||
unless => "test -f ${plugin_dir}/${base_plugin}",
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@ class gerrit::remotes($ensure=present) {
|
|||
file { '/home/gerrit2/remotes.config':
|
||||
ensure => absent,
|
||||
}
|
||||
class { 'jeepyb::fetch_remotes':
|
||||
class { '::jeepyb::fetch_remotes':
|
||||
ensure => $ensure,
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue