]> gitweb.fluxo.info Git - puppet-shorewall.git/commitdiff
Remove 'require augeas' (#4396)
authorMicah Anderson <micah@riseup.net>
Tue, 19 May 2015 16:54:53 +0000 (12:54 -0400)
committerMicah Anderson <micah@riseup.net>
Tue, 19 May 2015 16:54:53 +0000 (12:54 -0400)
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.

manifests/base.pp

index 4ee8747e3a88b9f2afaa6bd50c93271e7f932e10..edb0c4573e3e51a4fe402e48349474a8186890c2 100644 (file)
@@ -27,8 +27,6 @@ class shorewall::base {
     }
   } else {
 
-  require augeas
-
   augeas { 'shorewall_module_config_path':
     changes => 'set /files/etc/shorewall/shorewall.conf/CONFIG_PATH \'"/etc/shorewall/puppet:/etc/shorewall:/usr/share/shorewall"\'',
     lens    => 'Shellvars.lns',