Fixing lint and adding the trusty nodeset (not sure how that was missed)

diff --git a/Rakefile b/Rakefile
index 6d067dc56c2481e2eac4a18818d83b0c5659a1a7..5868545f200d5e068c8f3c24eece86c80f89b3bb 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -1,4 +1,10 @@
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
 
+PuppetLint.configuration.fail_on_warnings
+PuppetLint.configuration.send('disable_80chars')
+PuppetLint.configuration.send('disable_class_inherits_from_params_class')
+PuppetLint.configuration.send('disable_class_parameter_defaults')
+PuppetLint.configuration.send('disable_documentation')
 PuppetLint.configuration.send('disable_single_quote_string_with_variables')
+PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]

diff --git a/manifests/init.pp b/manifests/init.pp
index 48b62d178a30056b83d4edbde6598397bfad4497..5f5d0ac49f839f5c76b9444dbd9cd44b159c80db 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -134,7 +134,7 @@ class apt(
     owner   => root,
     group   => root,
   }
-  
+
   file { 'old-proxy-file':
     ensure  => absent,
     path    => "${apt_conf_d}/proxy",

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index ab79b9417904664542386c572a607772f51638b2..a55e1e0e5c7a075b04ee4861370d40e107a42254 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -15,7 +15,7 @@ define apt::ppa(
   }
 
   if $::operatingsystem != 'Ubuntu' {
-    fail("apt::ppa is currently supported on Ubuntu only.")
+    fail('apt::ppa is currently supported on Ubuntu only.')
   }
 
   $filename_without_slashes = regsubst($name, '/', '-', 'G')

diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp
index c57a9ee7f533b79b9a38e74d73d72909f8c1af7b..7e3ccc44b07637ee1a21d86b88f68a7eb03d516d 100644 (file)
--- a/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@ -16,26 +16,26 @@
 class apt::unattended_upgrades (
   $origins             = $::apt::params::origins,
   $blacklist           = [],
-  $update              = "1",
-  $download            = "1",
-  $upgrade             = "1",
-  $autoclean           = "7",
+  $update              = '1',
+  $download            = '1',
+  $upgrade             = '1',
+  $autoclean           = '7',
   $auto_fix            = true,
   $minimal_steps       = false,
   $install_on_shutdown = false,
-  $mail_to             = "NONE",
+  $mail_to             = 'NONE',
   $mail_only_on_error  = false,
   $remove_unused       = true,
   $auto_reboot         = false,
-  $dl_limit            = "NONE",
-  $enable              = "1",
-  $backup_interval     = "0",
-  $backup_level        = "3",
-  $max_age             = "0",
-  $min_age             = "0",
-  $max_size            = "0",
-  $download_delta      = "0",
-  $verbose             = "0",
+  $dl_limit            = 'NONE',
+  $enable              = '1',
+  $backup_interval     = '0',
+  $backup_level        = '3',
+  $max_age             = '0',
+  $min_age             = '0',
+  $max_size            = '0',
+  $download_delta      = '0',
+  $verbose             = '0',
 ) inherits ::apt::params {
 
   validate_bool(

diff --git a/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
new file mode 100644 (file)
index 0000000..cba1cd0
--- /dev/null
+++ b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
@@ -0,0 +1,11 @@
+HOSTS:
+  ubuntu-server-1404-x64:
+    roles:
+      - master
+    platform: ubuntu-14.04-amd64
+    box : puppetlabs/ubuntu-14.04-64-nocm
+    box_url : https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
+    hypervisor : vagrant
+CONFIG:
+  log_level   : debug
+  type: git