Merge pull request #132 from danieldreier/move_reports_dir_to_params

Move logic about where reports dir is

Author: zachfi

manifests/params.pp

@@ -135,4 +135,6 @@
     'OpenBSD' => '_puppet',
     default   => 'puppet',
   }
+
+  $report_dir = '/usr/lib/ruby/vendor_ruby/puppet/reports'
 }

manifests/reports.pp

@@ -3,14 +3,12 @@
 #
 class puppet::reports::graphite($server, $port, $prefix) {
 
-  include puppet::reports
-
   # This is a little bit dirty, as it just throws it straight in the
   # rubylib, but it's better than messing with libdir on the master.
   # See https://projects.puppetlabs.com/issues/4345 for mild
   # discussion.
   file{
-    "/${puppet::reports::report_dir}/graphite.rb":
+    "/${puppet::server::report_dir}/graphite.rb":
       ensure => present,
       owner  => 'root',
       group  => 'root',

manifests/reports/graphite.pp

@@ -9,14 +9,12 @@
     'httparty':;
   }
 
-  require puppet::reports
-
   # This is a little bit dirty, as it just throws it straight in the
   # rubylib, but it's better than messing with libdir on the master.
   # See https://projects.puppetlabs.com/issues/4345 for mild
   # discussion.
   file{
-    "${puppet::reports::report_dir}/irccat.rb":
+    "${puppet::server::report_dir}/irccat.rb":
       ensure => present,
       owner  => 'root',
       group  => 'root',

manifests/reports/irccat.pp

@@ -12,14 +12,12 @@
     'httparty':;
   }
 
-  include puppet::reports
-
   # This is a little bit dirty, as it just throws it straight in the
   # rubylib, but it's better than messing with libdir on the master.
   # See https://projects.puppetlabs.com/issues/4345 for mild
   # discussion.
   file{
-    "${puppet::reports::report_dir}/xmpp.rb":
+    "${puppet::server::report_dir}/xmpp.rb":
       ensure => present,
       owner  => 'root',
       group  => 'root',

manifests/reports/xmpp.pp

@@ -44,6 +44,7 @@
   $parser             = undef,
   $manage_puppetdb    = undef,
   $report             = true,
+  $report_dir         = $puppet::params::report_dir,
   $reportfrom         = undef,
   $reports            = ['store', 'https'],
   $reporturl          = "http://${::fqdn}/reports",