Skip to content

Commit 6645a72

Browse files
bastelfreakekohl
authored andcommitted
Add support for PE
This enables user to run foreman-proxy on a Puppet Enterprise primary.
1 parent 4cef127 commit 6645a72

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

manifests/init.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@
309309
Foreman_proxy::ListenOn $puppetca_listen_on = 'https',
310310
Stdlib::Absolutepath $ssldir = $foreman_proxy::params::ssldir,
311311
Stdlib::Absolutepath $puppetdir = $foreman_proxy::params::puppetdir,
312-
String $puppet_group = 'puppet',
312+
String $puppet_group = $foreman_proxy::params::puppet_group,
313313
String $puppetca_provider = 'puppetca_hostname_whitelisting',
314314
Stdlib::Absolutepath $autosignfile = $foreman_proxy::params::autosignfile,
315315
Boolean $puppetca_sign_all = false,

manifests/params.pp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,4 +174,11 @@
174174
# shares cached_data with the foreman module so they're the same
175175
$oauth_consumer_key = extlib::cache_data('foreman_cache_data', 'oauth_consumer_key', extlib::random_password(32))
176176
$oauth_consumer_secret = extlib::cache_data('foreman_cache_data', 'oauth_consumer_secret', extlib::random_password(32))
177+
178+
# PE uses a different user/group compared to open source puppet
179+
# the is_pe fact exists in PE and in stdlib. It can be true/false/undef (undef means open source)
180+
$puppet_group = $facts['is_pe'] ? {
181+
true => 'pe-puppet',
182+
default => 'puppet'
183+
}
177184
}

0 commit comments

Comments
 (0)