aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2015-05-19 12:54:53 -0400
committerMicah Anderson <micah@riseup.net>2015-05-19 12:54:53 -0400
commit2085f3a2fd4ca6889c327d9bb46a371a8969a7e8 (patch)
treecc5e18a231f93d7a27e29066e3cf8cb56129dbc0
parent74ea10a6a1d4f4c1624d85d3d3795eaf819df10c (diff)
downloadpuppet-shorewall-2085f3a2fd4ca6889c327d9bb46a371a8969a7e8.tar.gz
puppet-shorewall-2085f3a2fd4ca6889c327d9bb46a371a8969a7e8.tar.bz2
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.
-rw-r--r--manifests/base.pp2
1 files changed, 0 insertions, 2 deletions
diff --git a/manifests/base.pp b/manifests/base.pp
index 4ee8747..edb0c45 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -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',