From 0d9353051d5040fffa067c013710816651ef32fb Mon Sep 17 00:00:00 2001 From: Corporate Gadfly Date: Tue, 14 Apr 2026 17:08:19 -0400 Subject: [PATCH] remove pe_serverversion fact Signed-off-by: Corporate Gadfly --- .../puppet/jvm/compiler_spec.rb | 20 ------------------- .../puppet/server/compiler.rb | 6 ------ 2 files changed, 26 deletions(-) diff --git a/spec/puppet-server-lib/puppet/jvm/compiler_spec.rb b/spec/puppet-server-lib/puppet/jvm/compiler_spec.rb index 19fbb4a7d..31ddb2765 100644 --- a/spec/puppet-server-lib/puppet/jvm/compiler_spec.rb +++ b/spec/puppet-server-lib/puppet/jvm/compiler_spec.rb @@ -36,8 +36,6 @@ def set_facts(fact_hash) let(:node) { compiler.create_node(request_data) } - let(:pe_version_file) { '/opt/puppetlabs/server/pe_version' } - before(:each) do Puppet::Node.indirection.terminus_class = :plain end @@ -55,24 +53,6 @@ def set_facts(fact_hash) expect(node.server_facts).to include('serverversion' => Puppet.version.to_s) end - it 'the node has no pe_serverversion fact set when FOSS' do - expect(node.parameters).not_to include('pe_serverversion') - expect(node.server_facts).not_to include('pe_serverversion') - end - - it 'the node has pe_serverversion fact set when PE' do - set_facts({ - 'networking.fqdn' => "my.server.com", - 'networking.ip' => "my.ip.address", - 'networking.ip6' => nil - }) - allow(File).to receive(:readable?).with(pe_version_file).and_return(true) - allow(File).to receive(:zero?).with(pe_version_file).and_return(false) - allow(File).to receive(:read).with(pe_version_file).and_return('2019.3.0') - expect(node.parameters).to include('pe_serverversion' => '2019.3.0') - expect(node.server_facts).to include('pe_serverversion' => '2019.3.0') - end - context 'the classified node has a different environment' do let(:environment) { 'fancy' } diff --git a/src/ruby/puppetserver-lib/puppet/server/compiler.rb b/src/ruby/puppetserver-lib/puppet/server/compiler.rb index 50cd2afba..ccdc234f2 100644 --- a/src/ruby/puppetserver-lib/puppet/server/compiler.rb +++ b/src/ruby/puppetserver-lib/puppet/server/compiler.rb @@ -229,12 +229,6 @@ def get_facts_from_terminus(nodename, environment) def set_server_facts @server_facts = {} - # Add our server Puppet Enterprise version, if available. - pe_version_file = '/opt/puppetlabs/server/pe_version' - if File.readable?(pe_version_file) and !File.zero?(pe_version_file) - @server_facts['pe_serverversion'] = File.read(pe_version_file).chomp - end - # Add our server version to the fact list @server_facts['serverversion'] = Puppet.version.to_s