Merge pull request #298 from oranenj/rhel8_support

Fix selinux_port on RHEL 8/CentOS 8
voxpupuli · Oct 3, 2019 · 2ba6738 · 2ba6738
2 parents 5df2c73 + f682c34
commit 2ba6738
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/lib/facter/selinux_python_command.rb b/lib/facter/selinux_python_command.rb
@@ -0,0 +1,15 @@
+Facter.add(:selinux_python_command) do
+  confine osfamily: 'RedHat'
+  setcode do
+    if File.exist? '/usr/libexec/platform-python'
+      # RHEL 8 / CentOS 8
+      '/usr/libexec/platform-python'
+    elsif Facter::Core::Execution.execute('rpm -q python3-libsemanage') !~ %r{not installed}
+      'python3'
+    else
+      # This might be python 2 or 3. Keeping it at 'python' matches the module
+      # worked previously
+      'python'
+    end
+  end
+end
diff --git a/lib/facter/selinux_semanage_is_python3.rb b/lib/facter/selinux_semanage_is_python3.rb
diff --git a/lib/puppet/provider/selinux_port/semanage.rb b/lib/puppet/provider/selinux_port/semanage.rb
@@ -5,8 +5,7 @@
   # SELinux must be enabled. Is there a way to get a better error message?
   confine selinux: true
 
-  # custom fact, needed for fedora 24+
-  python_command = Facter.value(:selinux_semanage_is_python3) ? 'python3' : 'python'
+  python_command = Facter.value(:selinux_python_command)
   # current file path is lib/puppet/provider/selinux_port/semanage.rb
   # semanage_ports.py is lib/puppet_x/voxpupuli/selinux/semanage_ports.py
   PORTS_HELPER = File.expand_path('../../../../puppet_x/voxpupuli/selinux/semanage_ports.py', __FILE__)