diff --git a/manifests/params.pp b/manifests/params.pp index 0cb75a74..0a77a70d 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -66,17 +66,9 @@ else { $collection = 'puppet8' } - # The aio puppet-agent version currently installed on the compiling master - # (only used in PE) - if is_function_available('pe_compiling_server_aio_build') { - $master_agent_version = pe_compiling_server_aio_build() - } else { - $master_agent_version = undef - } } else { $_pe_version = undef $pe_repo_dir = undef - $master_agent_version = undef $collection = 'PC1' } } diff --git a/spec/classes/puppet_agent_spec.rb b/spec/classes/puppet_agent_spec.rb index 43dacc46..fa8311f1 100644 --- a/spec/classes/puppet_agent_spec.rb +++ b/spec/classes/puppet_agent_spec.rb @@ -237,7 +237,7 @@ def global_facts(facts, os) before(:each) do Puppet::Parser::Functions.newfunction(:pe_build_version, type: :rvalue) { |_args| '2000.0.0' } Puppet::Parser::Functions.newfunction(:pe_compiling_server_aio_build, type: :rvalue) { |_args| '1.10.100' } - Puppet::Parser::Functions.newfunction(:pe_compiling_server_version, type: :rvalue) { |_args| '2.20.200' } + Puppet::Type.newtype(:pe_anchor) end context 'package_version is initialized automatically' do