Add manage_ruby, making the management of ruby in reports optional

Author: downsj3

manifests/init.pp

@@ -32,6 +32,8 @@
 #       the scheme: "fact_name:fact_value".
 #   $puppet_run_reports
 #       Will send results from your puppet agent runs back to the datadog service.
+#   $manage_ruby
+#       Invoke the ruby class to manage ruby install
 #   $puppetmaster_user
 #       Will chown the api key used by the report processor to this user.
 #       Defaults to the user the puppetmaster is configured to run as.
@@ -243,6 +245,7 @@
   $service_ensure = 'running',
   $service_enable = true,
   Boolean $manage_repo = true,
+  Boolean $manage_ruby = true,
   $hostname_extraction_regex = undef,
   Boolean $hostname_fqdn = false,
   $dogstatsd_port = 8125,
@@ -706,6 +709,7 @@
     class { 'datadog_agent::reports':
       api_key                   => $api_key,
       datadog_site              => $datadog_site,
+      manage_ruby               => $manage_ruby,
       puppet_gem_provider       => $puppet_gem_provider,
       dogapi_version            => $datadog_agent::params::dogapi_version,
       puppetmaster_user         => $puppetmaster_user,

manifests/reports.pp

@@ -15,6 +15,7 @@
 #
 class datadog_agent::reports(
   $api_key,
+  $manage_ruby = true,
   $puppetmaster_user,
   $dogapi_version,
   $hostname_extraction_regex = undef,
@@ -28,21 +29,28 @@
 
   } else {
 
-    include datadog_agent
-    $rubydev_package = $datadog_agent::params::rubydev_package
+    if $manage_ruby {
+      include datadog_agent
+      $rubydev_package = $datadog_agent::params::rubydev_package
 
-    # check to make sure that you're not installing rubydev somewhere else
-    if ! defined(Package[$rubydev_package]) {
-      package {$rubydev_package:
-        ensure => installed,
-        before => Package['dogapi']
+      # check to make sure that you're not installing rubydev somewhere else
+      if ! defined(Package[$rubydev_package]) {
+        package {$rubydev_package:
+          ensure => installed,
+          before => Package['dogapi']
+        }
+      }
+
+      if (! defined(Package['rubygems'])) {
+        # Ensure rubygems is installed
+        class { 'ruby':
+          rubygems_update => false
+        }
       }
-    }
 
-    if (! defined(Package['rubygems'])) {
-      # Ensure rubygems is installed
-      class { 'ruby':
-        rubygems_update => false
+      package{ 'dogapi':
+        ensure   => $dogapi_version,
+        provider => $puppet_gem_provider,
       }
     }
 
@@ -55,10 +63,5 @@
       require => File['/etc/datadog-agent'],
     }
 
-    package{ 'dogapi':
-      ensure   => $dogapi_version,
-      provider => $puppet_gem_provider,
-    }
-
   }
 }