Fix validate command.

Author: MemberIT

manifests/fact.pp

@@ -12,13 +12,18 @@
 
   validate_re($title, '^[0-9A-Za-z_\-]+$', 'The $title fact does not match ^[0-9A-Za-z_\-]+$')
   $facter_data = { "${title}" => $value }
+  if ( versioncmp($::puppetversion, '4.0.0') < 0 ) {
+    $validate_cmd = "/usr/bin/env ruby -ryaml -e \"YAML.load_file '%'\""
+  } else {
+    $validate_cmd = "/opt/puppetlabs/puppet/bin/ruby -ryaml -e \"YAML.load_file '%'\""
+  }
 
   file { "${facterbasepath}/facts.d/${title}.yaml":
     ensure       => $ensure,
     owner        => 'root',
     group        => $::puppet::defaults::puppet_group,
     mode         => '0640',
-    validate_cmd => "/usr/bin/env ruby -ryaml -e \"YAML.load_file '%'\"",
+    validate_cmd => $validate_cmd,
     content      => template('puppet/fact.yaml.erb'),
   }
 

manifests/facts.pp

@@ -14,13 +14,18 @@
   if $custom_facts {
     validate_hash($custom_facts)
   }
+  if ( versioncmp($::puppetversion, '4.0.0') < 0 ) {
+    $validate_cmd = "/usr/bin/env ruby -ryaml -e \"YAML.load_file '%'\""
+  } else {
+    $validate_cmd = "/opt/puppetlabs/puppet/bin/ruby -ryaml -e \"YAML.load_file '%'\""
+  }
 
   file { "${facterbasepath}/facts.d/local.yaml":
     ensure       => file,
     owner        => 'root',
     group        => $::puppet::defaults::puppet_group,
     mode         => '0640',
-    validate_cmd => "/usr/bin/env ruby -ryaml -e \"YAML.load_file '%'\"",
+    validate_cmd => $validate_cmd,
     content      => template('puppet/local_facts.yaml.erb'),
   }