From 9f823eef7e0cc1c3d2983a5493f847e15d0b203f Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@gazlene.net>
Date: Tue, 11 Aug 2015 14:55:54 -0700
Subject: [PATCH] Add Gemfile and puppet 4 checks

In anticipation of puppet 4, start trying to deal with puppet 4 things
that can be helpfully predicted by puppet lint plugins. Also fix lint
errors caught by the puppet-lint-absolute_classname-check gem and arrow
alignment errors now caught by the modern puppet-lint gem.

We disable the puppet-lint-empty_string-check check for now, to be
fixed later, because this module makes heavy use of empty string
defaults and updating this needs to be done with care.

Change-Id: I90e74f25a1aa176d336afc591ac1da9c03c77aa7
---
 .gitignore          |  2 ++
 Gemfile             | 32 ++++++++++++++++++++++++++++++++
 manifests/deploy.pp | 11 ++++++-----
 manifests/init.pp   |  8 ++++----
 4 files changed, 44 insertions(+), 9 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 Gemfile

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..dade81e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+Gemfile.lock
+.bundled_gems/
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..d7f72f8
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,32 @@
+source 'https://rubygems.org'
+
+group :development, :test do
+  gem 'puppetlabs_spec_helper', :require => false
+
+  gem 'metadata-json-lint'
+  # This is nice and all, but let's not worry about it until we've actually
+  # got puppet 4.x sorted
+  # 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'
+  # This module makes too much use of empty string defaults,
+  # so disable this check for now
+  #gem 'puppet-lint-empty_string-check'
+  gem 'puppet-lint-leading_zero-check'
+  gem 'puppet-lint-variable_contains_upcase'
+  gem 'puppet-lint-spaceship_operator_without_tag-check'
+  gem 'puppet-lint-undef_in_function-check'
+
+  if puppetversion = ENV['PUPPET_GEM_VERSION']
+    gem 'puppet', puppetversion, :require => false
+  else
+    gem 'puppet', '~> 3.0', :require => false
+  end
+
+end
+
+# vim:ft=ruby
diff --git a/manifests/deploy.pp b/manifests/deploy.pp
index adff643..8541d5e 100644
--- a/manifests/deploy.pp
+++ b/manifests/deploy.pp
@@ -21,10 +21,10 @@ define openstackid::deploy (
   $deploy_dirs = [ '/opt/deploy', '/opt/deploy/conf.d' ]
 
   file { $deploy_dirs:
-    ensure  => directory,
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0755',
+    ensure => directory,
+    owner  => 'root',
+    group  => 'root',
+    mode   => '0755',
   }
 
   file { '/opt/deploy/deploy.sh':
@@ -50,4 +50,5 @@ define openstackid::deploy (
     mode    => '0644',
     require => File[$deploy_dirs],
   }
-}
\ No newline at end of file
+}
+
diff --git a/manifests/init.pp b/manifests/init.pp
index ae91d81..81864b2 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -149,10 +149,10 @@ class openstackid (
   $docroot_dirs = [ '/srv/openstackid' ]
 
   file { $docroot_dirs:
-    ensure  => directory,
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0755',
+    ensure => directory,
+    owner  => 'root',
+    group  => 'root',
+    mode   => '0755',
   }
 
   include ::httpd