Merge pull request #23 from Sharpie/enable-foss-usage

jarretlavallee · web-flow · commit efa644f80a07 · 2019-09-18T16:03:40.000-06:00
Skip versioncmp when pe_server_version is missing
diff --git a/manifests/puppetserver.pp b/manifests/puppetserver.pp
@@ -18,7 +18,7 @@
     override_metrics_command => $override_metrics_command,
   }
 
-  if versioncmp($facts['pe_server_version'], '2018.1.0') < 0 {
+  if ($facts['pe_server_version'] =~ NotUndef) and (versioncmp($facts['pe_server_version'], '2018.1.0') < 0) {
     $additional_metrics = [
       { 'name' => 'compiler.find_node',
         'url'  => "puppetserver:name=puppetlabs.${::hostname}.compiler.find_node" },

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`override_metrics_command => $override_metrics_command,`
`19`	`19`	`}`
`20`	`20`
`21`		`- if versioncmp($facts['pe_server_version'], '2018.1.0') < 0 {`
	`21`	`+ if ($facts['pe_server_version'] =~ NotUndef) and (versioncmp($facts['pe_server_version'], '2018.1.0') < 0) {`
`22`	`22`	`$additional_metrics = [`
`23`	`23`	`{ 'name' => 'compiler.find_node',`
`24`	`24`	`'url' => "puppetserver:name=puppetlabs.${::hostname}.compiler.find_node" },`