Add support for running on PE

theforeman · Dec 6, 2024 · 2f6c193 · 2f6c193
1 parent 9b0ac1e
commit 2f6c193
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -47,8 +47,8 @@
   Boolean $enc_upload_facts = true,
   Enum['yaml', 'json'] $enc_fact_extension = $puppetserver_foreman::params::enc_fact_extension,
   Stdlib::Absolutepath $puppet_home = $puppetserver_foreman::params::puppet_home,
-  String $puppet_user = 'puppet',
-  String $puppet_group = 'puppet',
+  String $puppet_user = $puppetserver_foreman::params::puppet_user,
+  String $puppet_group = $puppet_user,
   Stdlib::Absolutepath $puppet_basedir = $puppetserver_foreman::params::puppet_basedir,
   Stdlib::Absolutepath $puppet_etcdir = $puppetserver_foreman::params::puppet_etcdir,
   Boolean $reports = true,

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -52,4 +52,11 @@
   $client_ssl_key  = "${puppet_ssldir}/private_keys/${lower_fqdn}.pem"
 
   $enc_fact_extension = bool2str(versioncmp($facts['puppetversion'], '7.0') >= 0, 'json', 'yaml')
+
+  # PE uses a different user/group compared to open source puppet
+  # the is_pe fact exists in PE and in stdlib. It can be true/false/undef (undef means open source)
+  $puppet_user = $facts['is_pe'] ? {
+    true => 'pe-puppet',
+    default => 'puppet'
+  }
 }