From 1e5658b24adfc4136fd707589021e320b1b77a29 Mon Sep 17 00:00:00 2001
From: Trevor Vaughan <tvaughan@onyxpoint.com>
Date: Mon, 16 Sep 2019 17:33:47 -0400
Subject: [PATCH] Fix PE detection (for the moment)

---
 lib/facter/pe_version.rb | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/facter/pe_version.rb b/lib/facter/pe_version.rb
index d01185580..81cd1fd02 100644
--- a/lib/facter/pe_version.rb
+++ b/lib/facter/pe_version.rb
@@ -11,13 +11,17 @@
 # Fact: pe_version
 Facter.add('pe_version') do
   setcode do
-    puppet_ver = Facter.value('puppetversion')
-    if !puppet_ver.nil?
-      pe_ver = puppet_ver.match(%r{Puppet Enterprise (\d+\.\d+\.\d+)})
-      pe_ver[1] if pe_ver
-    else
-      nil
+    found_version = Facter.value('pe_build')
+
+    unless found_version
+      puppet_ver = Facter.value('puppetversion')
+      unless puppet_ver.nil?
+        pe_ver = puppet_ver.match(%r{Puppet Enterprise (\d+\.\d+\.\d+)})
+        found_version = pe_ver[1] if pe_ver
+      end
     end
+
+    found_version
   end
 end