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

Puppet 6 compatibility #41

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

Puppet 6 compatibility #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
211bf8d
use Puppet4xAdapter for Puppet 6 as well
gera Sep 21, 2020
7119b5c
Use RuntimeError instead of RuntimeException
gera Sep 21, 2020
d31fb3c
use the FQDN when creating the node
gera Sep 21, 2020
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
4 changes: 3 additions & 1 deletion lib/puppet-catalog-test/puppet_adapter_factory.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@ def self.create_adapter(config)
return Puppet4xAdapter.new(config)
elsif Puppet.version.start_with?("5.")
return Puppet4xAdapter.new(config)
elsif Puppet.version.start_with?("6.")
return Puppet4xAdapter.new(config)
end

raise RuntimeException, "Unsupported Puppet version detected (#{Puppet.version})"
raise RuntimeError, "Unsupported Puppet version detected (#{Puppet.version})"
end
end
end
2 changes: 1 addition & 1 deletion lib/puppet-catalog-test/test_runner.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def compile_catalog(node_fqdn, facts = {})
hostname = node_fqdn.split('.').first
facts['hostname'] = hostname

node = @puppet_adapter.create_node(hostname, facts)
node = @puppet_adapter.create_node(node_fqdn, facts)

@puppet_adapter.compile(node)
end
Expand Down