From 15f4810c061c7e3f150d8d14d7393010c8fa87a5 Mon Sep 17 00:00:00 2001
From: Sebastien Badia <sebastien.badia@enovance.com>
Date: Wed, 25 Feb 2015 05:12:22 +0100
Subject: [PATCH] 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
---
 Gemfile                      |  9 +++++++++
 examples/site.pp             | 10 +++++-----
 manifests/api.pp             |  4 ++--
 manifests/client.pp          |  2 +-
 manifests/generic_service.pp |  4 ++--
 manifests/init.pp            |  2 +-
 6 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3d9d4ad..b0b2d45 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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'
diff --git a/examples/site.pp b/examples/site.pp
index e7cc999..416b07b 100644
--- a/examples/site.pp
+++ b/examples/site.pp
@@ -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'
diff --git a/manifests/api.pp b/manifests/api.pp
index 5796677..63e7530 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -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']
diff --git a/manifests/client.pp b/manifests/client.pp
index 7cafb86..ebbcf10 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -30,7 +30,7 @@ class tuskar::client (
   $package_ensure = present
 ) {
 
-  include tuskar::params
+  include ::tuskar::params
 
   package { 'python-tuskarclient':
     ensure => $package_ensure,
diff --git a/manifests/generic_service.pp b/manifests/generic_service.pp
index 916d4d2..9ceb05d 100644
--- a/manifests/generic_service.pp
+++ b/manifests/generic_service.pp
@@ -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 |>
diff --git a/manifests/init.pp b/manifests/init.pp
index 05840a9..8d79d74 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -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"',