Add Puppet 4.x lint checks

This changes the puppet-lint requirement to 1.1.x, so that we can
puppet-lint plugins. Most of these plugins are for 4.x compat, but
just catch common errors.

Change-Id: Ic7e3e5f2200c61760436d2c3b2f504e18248a15a
This commit is contained in:
Sebastien Badia 2015-02-25 05:12:22 +01:00
parent 7c18a413d3
commit 15f4810c06
6 changed files with 20 additions and 11 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

@ -1,8 +1,8 @@
# This is an example of site.pp to deploy Tuskar
class { 'tuskar::client': }
class { '::tuskar::client': }
class { 'tuskar::keystone::auth':
class { '::tuskar::keystone::auth':
admin_address => '10.0.0.1',
internal_address => '10.0.0.1',
public_address => '10.0.0.1',
@ -10,17 +10,17 @@ class { 'tuskar::keystone::auth':
region => 'OpenStack'
}
class { 'tuskar::db::mysql':
class { '::tuskar::db::mysql':
password => 'dbpass',
host => '10.0.0.1',
allowed_hosts => '10.0.0.1'
}
class { 'tuskar':
class { '::tuskar':
database_connection => 'mysql://tuskar:secrete@10.0.0.1/tuskar?charset=utf8',
}
class { 'tuskar::api':
class { '::tuskar::api':
bind_host => '10.0.0.1',
identity_uri => 'https://identity.openstack.org:35357',
keystone_password => 'verysecrete'

View File

@ -106,8 +106,8 @@ class tuskar::api(
$ensure_package = 'present',
) inherits tuskar {
require keystone::python
include tuskar::params
require ::keystone::python
include ::tuskar::params
Tuskar_config<||> ~> Exec['post-tuskar_config']
Tuskar_config<||> ~> Service['tuskar-api']

View File

@ -30,7 +30,7 @@ class tuskar::client (
$package_ensure = present
) {
include tuskar::params
include ::tuskar::params
package { 'python-tuskarclient':
ensure => $package_ensure,

View File

@ -35,8 +35,8 @@ define tuskar::generic_service(
$ensure_package = 'present'
) {
include tuskar::params
include tuskar::db::sync
include ::tuskar::params
include ::tuskar::db::sync
$tuskar_title = "tuskar-${name}"
Exec['post-tuskar_config'] ~> Service<| title == $tuskar_title |>

View File

@ -33,7 +33,7 @@ class tuskar(
$database_connection = 'sqlite:////var/lib/tuskar/tuskar.sqlite',
$database_idle_timeout = 3600,
) {
include tuskar::params
include ::tuskar::params
exec { 'post-tuskar_config':
command => '/bin/echo "Tuskar config has changed"',