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.

Change-Id: If5f03538be85cee4a1d3b4c9a87eae1230432114
This commit is contained in:
Sebastien Badia 2015-02-25 04:09:06 +01:00 committed by Gael Chamoulaud
parent d7e9fe0e7a
commit 44e1bbf039
9 changed files with 27 additions and 18 deletions

View File

@ -6,6 +6,15 @@ group :development, :test do
gem 'metadata-json-lint'
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-leading_zero-check'
gem 'puppet-lint-variable_contains_upcase'
gem 'puppet-lint-numericvariable'
gem 'json'
gem 'webmock'

View File

@ -4,26 +4,26 @@ node default {
}
# First, install a mysql server
class { 'mysql::server': }
class { '::mysql::server': }
# And create the database
class { 'heat::db::mysql':
class { '::heat::db::mysql':
password => 'heat',
}
# Common class
class { 'heat':
class { '::heat':
# The keystone_password parameter is mandatory
keystone_password => 'password',
sql_connection => 'mysql://heat:heat@localhost/heat'
}
# Install heat-engine
class { 'heat::engine':
class { '::heat::engine':
auth_encryption_key => 'whatever-key-you-like',
}
# Install the heat-api service
class { 'heat::api': }
class { '::heat::api': }
}

View File

@ -53,9 +53,9 @@ class heat::api (
$key_file = false,
) {
include heat
include heat::params
include heat::policy
include ::heat
include ::heat::params
include ::heat::policy
Heat_config<||> ~> Service['heat-api']
Class['heat::policy'] -> Service['heat-api']

View File

@ -56,9 +56,9 @@ class heat::api_cfn (
$key_file = false,
) {
include heat
include heat::params
include heat::policy
include ::heat
include ::heat::params
include ::heat::policy
Heat_config<||> ~> Service['heat-api-cfn']
Class['heat::policy'] -> Service['heat-api-cfn']

View File

@ -55,9 +55,9 @@ class heat::api_cloudwatch (
$key_file = false,
) {
include heat
include heat::params
include heat::policy
include ::heat
include ::heat::params
include ::heat::policy
Heat_config<||> ~> Service['heat-api-cloudwatch']
Class['heat::policy'] -> Service['heat-api-cloudwatch']

View File

@ -11,7 +11,7 @@ class heat::client (
$ensure = 'present'
) {
include heat::params
include ::heat::params
package { 'python-heatclient':
ensure => $ensure,

View File

@ -67,7 +67,7 @@ class heat::engine (
$configure_delegated_roles = true, #DEPRECATED
) {
include heat::params
include ::heat::params
Heat_config<||> ~> Service['heat-engine']

View File

@ -222,7 +222,7 @@ class heat(
$keystone_protocol = 'http',
) {
include heat::params
include ::heat::params
if $kombu_ssl_ca_certs and !$rabbit_use_ssl {
fail('The kombu_ssl_ca_certs parameter requires rabbit_use_ssl to be set to true')

View File

@ -38,7 +38,7 @@ class heat::keystone::domain (
$domain_password = 'changeme',
) {
include heat::params
include ::heat::params
$cmd_evn = [
"OS_USERNAME=${keystone_admin}",