Skip to content

Commit 565c78c

Browse files
sbadiastrider
authored andcommitted
Add Puppet 4.x lint checks
This changes the puppet-lint requirement to 1.1.x, so that we can use puppet-lint plugins. Most of these plugins are for 4.x compat, but some just catch common errors. This commit also remove custom metadata rake task (this task is now provided by puppetlabs_spec_helper). Conflicts: Gemfile Change-Id: I22369948db6a2f8ddab9b8c93c3a047ff2e229ca
1 parent 55b7aad commit 565c78c

17 files changed

Lines changed: 41 additions & 35 deletions

File tree

Gemfile

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,20 @@ source 'https://rubygems.org'
22

33
group :development, :test do
44
gem 'puppetlabs_spec_helper', :require => false
5-
gem 'rspec-puppet', '~> 2.0.0'
6-
gem 'puppet-lint-param-docs'
5+
gem 'rspec-puppet', '~> 2.0.0', :require => false
6+
77
gem 'metadata-json-lint'
8+
gem 'puppet-lint-param-docs'
9+
gem 'puppet-lint-absolute_classname-check'
10+
gem 'puppet-lint-absolute_template_path'
11+
gem 'puppet-lint-trailing_newline-check'
12+
13+
# Puppet 4.x related lint checks
14+
gem 'puppet-lint-unquoted_string-check'
15+
gem 'puppet-lint-leading_zero-check'
16+
gem 'puppet-lint-variable_contains_upcase'
17+
gem 'puppet-lint-numericvariable'
18+
819
gem 'json'
920
gem 'webmock'
1021
end

Rakefile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,3 @@ PuppetLint.configuration.send('disable_only_variable_string')
1010
exclude_tests_paths = ['pkg/**/*','vendor/**/*']
1111
PuppetLint.configuration.ignore_paths = exclude_tests_paths
1212
PuppetSyntax.exclude_paths = exclude_tests_paths
13-
14-
desc "Lint metadata.json file"
15-
task :metadata do
16-
sh "metadata-json-lint metadata.json"
17-
end

examples/site.pp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,39 @@
44
}
55

66
# First, install a mysql server
7-
class { 'mysql::server': }
7+
class { '::mysql::server': }
88
# And create the database
9-
class { 'ceilometer::db::mysql':
9+
class { '::ceilometer::db::mysql':
1010
password => 'ceilometer',
1111
}
1212

1313
# Add the base ceilometer class & parameters
1414
# This class is required by ceilometer agents & api classes
1515
# The metering_secret parameter is mandatory
16-
class { 'ceilometer':
16+
class { '::ceilometer':
1717
metering_secret => 'darksecret'
1818
}
1919

2020
# Configure the ceilometer database
2121
# Only needed if ceilometer::agent::central or ceilometer::api are declared
22-
class { 'ceilometer::db':
22+
class { '::ceilometer::db':
2323
}
2424

2525
# Configure ceilometer database with mongodb
2626

27-
# class { 'ceilometer::db':
27+
# class { '::ceilometer::db':
2828
# database_connection => 'mongodb://localhost:27017/ceilometer',
2929
# require => Class['mongodb'],
3030
# }
3131

3232
# Install the ceilometer-api service
3333
# The keystone_password parameter is mandatory
34-
class { 'ceilometer::api':
34+
class { '::ceilometer::api':
3535
keystone_password => 'tralalayouyou'
3636
}
3737

3838
# Set common auth parameters used by all agents (compute/central)
39-
class { 'ceilometer::agent::auth':
39+
class { '::ceilometer::agent::auth':
4040
auth_url => 'http://localhost:35357/v2.0',
4141
auth_password => 'tralalerotralala'
4242
}
@@ -59,7 +59,7 @@
5959
# ipmi_namespace => true
6060
# }
6161
# As default use central and compute polling namespaces
62-
class { 'ceilometer::agent::polling':
62+
class { '::ceilometer::agent::polling':
6363
central_namespace => true,
6464
compute_namespace => true,
6565
ipmi_namespace => false,
@@ -75,20 +75,20 @@
7575
# }
7676

7777
# Install alarm notifier
78-
class { 'ceilometer::alarm::notifier':
78+
class { '::ceilometer::alarm::notifier':
7979
}
8080

8181
# Install alarm evaluator
82-
class { 'ceilometer::alarm::evaluator':
82+
class { '::ceilometer::alarm::evaluator':
8383
}
8484

8585
# Purge 1 month old meters
86-
class { 'ceilometer::expirer':
86+
class { '::ceilometer::expirer':
8787
time_to_live => '2592000'
8888
}
8989

9090
# Install notification agent
91-
class { 'ceilometer::agent::notification':
91+
class { '::ceilometer::agent::notification':
9292
}
9393

9494
}

manifests/agent/central.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
$coordination_url = undef,
2626
) {
2727

28-
include ceilometer::params
28+
include ::ceilometer::params
2929

3030
Ceilometer_config<||> ~> Service['ceilometer-agent-central']
3131

manifests/agent/compute.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
warning('This class is deprecated. Please use ceilometer::agent::polling with compute namespace instead.')
2424

25-
include ceilometer::params
25+
include ::ceilometer::params
2626

2727
Ceilometer_config<||> ~> Service['ceilometer-agent-compute']
2828

manifests/agent/notification.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
$package_ensure = 'present',
5353
) {
5454

55-
include ceilometer::params
55+
include ::ceilometer::params
5656

5757
Ceilometer_config<||> ~> Service['ceilometer-agent-notification']
5858

manifests/agent/polling.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
$coordination_url = undef,
4141
) inherits ceilometer {
4242

43-
include ceilometer::params
43+
include ::ceilometer::params
4444

4545
if $central_namespace {
4646
$central_namespace_name = 'central'

manifests/alarm/evaluator.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
$coordination_url = undef,
4040
) {
4141

42-
include ceilometer::params
42+
include ::ceilometer::params
4343

4444
validate_re("${evaluation_interval}",'^(\d+)$')
4545

manifests/alarm/notifier.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
$rest_notifier_ssl_verify = true,
3535
) {
3636

37-
include ceilometer::params
37+
include ::ceilometer::params
3838

3939
validate_bool($rest_notifier_ssl_verify)
4040

manifests/api.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@
7676
$port = '8777'
7777
) {
7878

79-
include ceilometer::params
80-
include ceilometer::policy
79+
include ::ceilometer::params
80+
include ::ceilometer::policy
8181

8282
validate_string($keystone_password)
8383

0 commit comments

Comments
 (0)