Fixes #30506: Ensure selinux packages are installed before puppet run

theforeman · Jul 28, 2020 · 115a557 · 115a557
1 parent 79f5096
commit 115a557
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/hooks/boot/01-kafo-hook-extensions.rb b/hooks/boot/01-kafo-hook-extensions.rb
@@ -45,6 +45,10 @@ def foreman_server?
     module_enabled?('foreman')
   end
 
+  def katello_enabled?
+    module_enabled?('katello')
+  end
+
   def devel_scenario?
     module_enabled?('katello_devel')
   end

diff --git a/hooks/pre/31_install_scl_packages.rb b/hooks/pre/31_install_scl_packages.rb
diff --git a/hooks/pre/32-install_selinux_packages.rb b/hooks/pre/32-install_selinux_packages.rb
@@ -0,0 +1,16 @@
+# Working around https://tickets.puppetlabs.com/browse/PUP-10548
+if facts[:selinux]
+  packages = []
+
+  if el7?
+    packages << 'rh-postgresql12-postgresql-server' if local_postgresql?
+    packages << 'rh-redis5-redis' if local_redis?
+  end
+
+  packages << 'foreman-selinux' if foreman_server?
+  packages << 'katello-selinux' if katello_enabled?
+  packages << 'candlepin-selinux' if katello_enabled?
+  packages << 'pulpcore-selinux' if pulpcore_enabled?
+
+  ensure_packages(packages, 'installed')
+end