Skip to content

remove pe_serverversion fact #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
corporate-gadfly wants to merge 1 commit into
base: main
Choose a base branch
from
Open

remove pe_serverversion fact #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions spec/puppet-server-lib/puppet/jvm/compiler_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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' }

Expand Down
6 changes: 0 additions & 6 deletions src/ruby/puppetserver-lib/puppet/server/compiler.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading