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.

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

Changed load paths for relative paths in firewalld_direct_purge.rb #80

Merged
merged 2 commits into from
Aug 17, 2016

Conversation

vilkasx
Copy link

@vilkasx vilkasx commented Aug 17, 2016

This commit should fix problem when puppet agent getting compiled catalogs from puppetdb. With 3.1.1 version of crayfishx-firewalld I've got following error:

Error: Could not retrieve catalog from remote server: Error 400 on SERVER: Evaluation Error: Error while evaluating a Type-Name, Could not autoload puppet/type/firewalld_direct_purge: no such file to load -- puppet/type/firewalld_direct_chain at /etc/puppetlabs/code/environments/test_firewalld_module/modules/firewalld/manifests/init.pp:144:5

@crayfishx
Copy link
Contributor

thanks @vilkasx , we missed those when we rolled in #79 last night

I'll get this released as soon as it passes testing....

@crayfishx crayfishx added bug Something isn't working accepted labels Aug 17, 2016
@crayfishx crayfishx added this to the 3.1.2 milestone Aug 17, 2016
require 'puppet/type/firewalld_direct_passthrough'
require File.dirname(__FILE__).concat('/firewalld_direct_chain.rb')
require File.dirname(__FILE__).concat('/firewalld_direct_rule.rb')
require File.dirname(__FILE__).concat('/firewalld_direct_passthrough.rb')

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vilkasx Just for consistency, could you construct the filename in the same way as the providers do (see #79 )

eg:

File.join(File.dirname(__FILE__),  'firewalld_direct_chain.rb')

It's a bit nicer than using concat.....

@vilkasx
Copy link
Author

vilkasx commented Aug 17, 2016

Fixed in firewalld_direct_purge.rb and firewalld_zone.rb.

@crayfishx
Copy link
Contributor

@vilkasx that looks great, thanks - will merge and release a patch shortly.

@crayfishx crayfishx merged commit 50772f7 into voxpupuli:master Aug 17, 2016
@crayfishx
Copy link
Contributor

This patch has been released as 3.1.2 on the forge... many thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants