diff --git a/manifests/params.pp b/manifests/params.pp index 9d362d06..0cb75a74 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -40,11 +40,9 @@ $ssldir = "${confdir}/ssl" $config = "${confdir}/puppet.conf" - # The `is_pe` fact currently works by echoing out the puppet version - # and greping for "puppet enterprise". With Puppet 4 and PE 2015.2, there - # is no longer a "PE Puppet", and so that fact will no longer work. - # Instead check for the `is_pe` fact or if a PE provided function is available - $_is_pe = (getvar('::is_pe') or is_function_available('pe_compiling_server_version')) + # To determine if this is a PE installation or not, we check if the `pe_anchor` resource type exists + # it's provided by the puppet_enterprise module + $_is_pe = defined('pe_anchor') if $_is_pe { # Calculate the default collection $_pe_version = pe_build_version()