Skip to content
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

Jump to bottom

enc.rb: Replace fqdn->networking.fqdn fact #54

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

enc.rb: Replace fqdn->networking.fqdn fact #54

wants to merge 2 commits into from
+1 −1

Conversation

bastelfreak
Copy link
Member

Followup for #53 (review)

@bastelfreak bastelfreak added the Bug Something isn't working label Dec 16, 2024
@bastelfreak bastelfreak self-assigned this Dec 16, 2024
@bastelfreak bastelfreak mentioned this pull request Dec 16, 2024
Merged
@bastelfreak
Copy link
Member Author

(I haven't tested this locally)

ekohl
ekohl reviewed Dec 16, 2024
View reviewed changes
files/enc.rb Outdated Show resolved Hide resolved
@bastelfreak @ekohl
Update files/enc.rb
422bc90 
Co-authored-by: Ewoud Kohl van Wijngaarden <[email protected]>
@ekohl
Copy link
Member

ekohl commented Dec 17, 2024

I'm guessing test failures are related

@bastelfreak
Copy link
Member Author

I'm not 100% sure where spec/static_fixtures/fake.host.fqdn.com.yaml is coming from. It's a Puppet::Node::Facts object. Is that the kind of facts the puppetserver stored a decade ago? On modern systems you just have /opt/puppetlabs/server/data/puppetserver/server_data/facts/*.json, which is the same as puppet facts show, no Ruby object.

@ekohl
Copy link
Member

ekohl commented Dec 17, 2024

There is still code to load data from nodes so perhaps it's worth digging into when that was removed:

puppet-puppetserver_foreman/files/enc.rb

Lines 190 to 201 in 1c58844

# if there is no environment in facts
# get it from node file ({puppetdir}/yaml/node/
unless puppet_facts['values'].key?('environment') || puppet_facts['values'].key?('agent_specified_environment')
node_filename = filename.sub('/facts/', '/node/')
if File.exist?(node_filename)
node_data = parse_file(node_filename)
if node_data.key?('environment')
puppet_facts['values']['environment'] = node_data['environment']
end
end
end

@bastelfreak
Copy link
Member Author

https://www.puppet.com/docs/pe/2023.0/osp/server/release_notes.html#puppet-server-700

puppetserver 7 switched the default facts terminus from yaml to json.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ekohl ekohl ekohl approved these changes

Assignees

@bastelfreak bastelfreak

Labels
Bug Something isn't working
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@bastelfreak @ekohl