Commit 1cfb479d authored by ng's avatar ng
Browse files

Merge branch 'master' into 'master'

Remove 'require augeas' (#4396)

Because the puppet 'require' keyword actually instantiates a class,
having 'require augeas' in base.pp means that you cannot instantiate the
augeas class anywhere else in your manifests, for example with some
optional parameters to the class. If you do, you will get a duplicate
definition error.

The README already says that the augeas module is required. It seems
better that this is managed outside of the module, allowing for
class parameter flexibility.

See merge request !3
parents 40d8f49f 216af538
...@@ -27,7 +27,7 @@ class shorewall::base { ...@@ -27,7 +27,7 @@ class shorewall::base {
} }
} else { } else {
require augeas Class['augeas'] -> Class['shorewall::base']
augeas { 'shorewall_module_config_path': augeas { 'shorewall_module_config_path':
changes => 'set /files/etc/shorewall/shorewall.conf/CONFIG_PATH \'"/etc/shorewall/puppet:/etc/shorewall:/usr/share/shorewall"\'', changes => 'set /files/etc/shorewall/shorewall.conf/CONFIG_PATH \'"/etc/shorewall/puppet:/etc/shorewall:/usr/share/shorewall"\'',
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment