(FACT-2590) Add Rhel to hierarchy.

puppetlabs · Apr 29, 2020 · 97b0219 · 97b0219
1 parent 3eae28e
commit 97b0219
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/lib/framework/detector/os_detector.rb b/lib/framework/detector/os_detector.rb
@@ -8,6 +8,7 @@ class OsDetector
   attr_reader :identifier, :version, :hierarchy
 
   def initialize(*_args)
+    @log = Facter::Log.new(self)
     @os_hierarchy = Facter::OsHierarchy.new
     @identifier = detect
   end
@@ -39,8 +40,15 @@ def detect
 
   def detect_hierarchy(identifier)
     hierarchy = @os_hierarchy.construct_hierarchy(identifier)
-    hierarchy = @os_hierarchy.construct_hierarchy(detect_family) if hierarchy.empty?
-    hierarchy = @os_hierarchy.construct_hierarchy(:linux) if hierarchy.empty?
+    if hierarchy.empty?
+      @log.debug("Could not detect hierarchy using os identifier: #{identifier} , trying with family")
+      hierarchy = @os_hierarchy.construct_hierarchy(detect_family)
+    end
+
+    if hierarchy.empty?
+      @log.debug("Could not detect hierarchy using family #{detect_family}, falling back to Linux")
+      hierarchy = @os_hierarchy.construct_hierarchy(:linux)
+    end
 
     hierarchy
   end

diff --git a/os_hierarchy.json b/os_hierarchy.json
@@ -12,7 +12,8 @@
         "El": [
           "Fedora",
           "Amzn",
-          "Centos"
+          "Centos",
+          "Rhel"
         ]
       },
       {

diff --git a/spec/framework/detector/os_detector_spec.rb b/spec/framework/detector/os_detector_spec.rb
@@ -4,10 +4,12 @@
 
 describe OsDetector do
   let(:os_hierarchy) { instance_spy(Facter::OsHierarchy) }
+  let(:logger) { instance_spy(Facter::Log) }
 
   before do
     Singleton.__init__(OsDetector)
 
+    allow(Facter::Log).to receive(:new).and_return(logger)
     allow(Facter::OsHierarchy).to receive(:new).and_return(os_hierarchy)
   end