Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add additional puppet-lint checks and fix errors #277

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ group :development, :test do
gem 'rspec-puppet', '~> 2.0'
gem 'rspec-puppet-facts'
gem 'puppet-lint', '~> 2'
gem 'puppet-lint-absolute_classname-check'
gem 'puppet-lint-trailing_comma-check'
gem 'metadata-json-lint', '0.0.11' if RUBY_VERSION < '1.9'
gem 'metadata-json-lint' if RUBY_VERSION >= '1.9'
gem 'json', '~> 1.8'
Expand Down
2 changes: 1 addition & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@
manage_server => $manage_dbserver,
manage_package_repo => $manage_package_repo,
postgres_version => $postgres_version,
before => $database_before
before => $database_before,
}
}
}
8 changes: 4 additions & 4 deletions manifests/master/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
default => Package[$terminus_package],
}

class { 'puppetdb::master::routes':
class { '::puppetdb::master::routes':
puppet_confdir => $puppet_confdir,
masterless => $masterless,
require => $routes_require,
Expand All @@ -122,7 +122,7 @@
default => Package[$terminus_package],
}

class { 'puppetdb::master::storeconfigs':
class { '::puppetdb::master::storeconfigs':
puppet_conf => $puppet_conf,
masterless => $masterless,
require => $storeconfigs_require,
Expand All @@ -138,7 +138,7 @@
default => Package[$terminus_package],
}

class { 'puppetdb::master::report_processor':
class { '::puppetdb::master::report_processor':
puppet_conf => $puppet_conf,
masterless => $masterless,
enable => $enable_reports,
Expand All @@ -154,7 +154,7 @@
default => Package[$terminus_package],
}

class { 'puppetdb::master::puppetdb_conf':
class { '::puppetdb::master::puppetdb_conf':
server => $puppetdb_server,
port => $puppetdb_port,
soft_write_failure => $puppetdb_soft_write_failure,
Expand Down
8 changes: 4 additions & 4 deletions manifests/master/routes.pp
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
'facts' => {
'terminus' => 'puppetdb',
'cache' => 'yaml',
}
}
},
},
}
) inherits puppetdb::params {

Expand All @@ -23,8 +23,8 @@
'facts' => {
'terminus' => 'facter',
'cache' => 'puppetdb_apply',
}
}
},
},
}
} else {
$routes_real = $routes
Expand Down
14 changes: 7 additions & 7 deletions manifests/server.pp
Original file line number Diff line number Diff line change
Expand Up @@ -137,23 +137,23 @@
}

if $manage_firewall {
class { 'puppetdb::server::firewall':
class { '::puppetdb::server::firewall':
http_port => $listen_port,
open_http_port => $open_listen_port,
ssl_port => $ssl_listen_port,
open_ssl_port => $open_ssl_listen_port,
}
}

class { 'puppetdb::server::global':
class { '::puppetdb::server::global':
vardir => $vardir,
confdir => $confdir,
puppetdb_user => $puppetdb_user,
puppetdb_group => $puppetdb_group,
notify => Service[$puppetdb_service],
}

class { 'puppetdb::server::command_processing':
class { '::puppetdb::server::command_processing':
command_threads => $command_threads,
concurrent_writes => $concurrent_writes,
store_usage => $store_usage,
Expand All @@ -162,7 +162,7 @@
notify => Service[$puppetdb_service],
}

class { 'puppetdb::server::database':
class { '::puppetdb::server::database':
database => $database,
database_host => $database_host,
database_port => $database_port,
Expand All @@ -188,7 +188,7 @@
notify => Service[$puppetdb_service],
}

class { 'puppetdb::server::read_database':
class { '::puppetdb::server::read_database':
database => $read_database,
database_host => $read_database_host,
database_port => $read_database_port,
Expand Down Expand Up @@ -240,7 +240,7 @@
}
}

class { 'puppetdb::server::jetty':
class { '::puppetdb::server::jetty':
listen_address => $listen_address,
listen_port => $listen_port,
disable_cleartext => $disable_cleartext,
Expand All @@ -260,7 +260,7 @@
puppetdb_group => $puppetdb_group,
}

class { 'puppetdb::server::puppetdb':
class { '::puppetdb::server::puppetdb':
certificate_whitelist_file => $certificate_whitelist_file,
certificate_whitelist => $certificate_whitelist,
disable_update_checking => $disable_update_checking,
Expand Down
4 changes: 2 additions & 2 deletions manifests/server/database.pp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
# Because of a limitation in the postgres module this will break with
# a duplicate declaration if read and write database host+name are the
# same.
class { 'puppetdb::server::validate_db':
class { '::puppetdb::server::validate_db':
database => $database,
database_host => $database_host,
database_port => $database_port,
Expand Down Expand Up @@ -62,7 +62,7 @@
path => $database_ini,
ensure => present,
section => 'database',
require => $ini_setting_require
require => $ini_setting_require,
}

if $database == 'embedded' {
Expand Down
2 changes: 1 addition & 1 deletion manifests/server/firewall.pp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
$ssl_port = $puppetdb::params::ssl_listen_port,
$open_ssl_port = $puppetdb::params::open_ssl_listen_port,
) inherits puppetdb::params {
include firewall
include ::firewall

if ($open_http_port) {
firewall { "${http_port} accept - puppetdb":
Expand Down
2 changes: 1 addition & 1 deletion manifests/server/read_database.pp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
# Because of a limitation in the postgres module this will break with
# a duplicate declaration if read and write database host+name are the
# same.
class { 'puppetdb::server::validate_read_db':
class { '::puppetdb::server::validate_read_db':
database => $database,
database_host => $database_host,
database_port => $database_port,
Expand Down