summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah <micah@riseup.net>2017-02-24 17:35:55 +0000
committerMicah <micah@riseup.net>2017-02-24 17:35:55 +0000
commit837fd3f29f09727d5a20514d7549837b8d8b4997 (patch)
treec3d4f6553e9f706c58e2cb1f6d65f43bb7a06fcd
parent7aff745103df5771eac023f90ddfbab03dcd7600 (diff)
parent9205eb4a039680b39c3802fd0f39e79eaf47a123 (diff)
Merge branch 'avoid-duplicate-package-definition' into 'master'
Use ensure_packages, to avoid duplicate definition in case Package['shorewall'] is defined elsewhere already. See merge request !10
-rw-r--r--manifests/base.pp4
1 files changed, 1 insertions, 3 deletions
diff --git a/manifests/base.pp b/manifests/base.pp
index 6599759..dddfcaa 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -1,9 +1,7 @@
# base things for shorewall
class shorewall::base {
- package { 'shorewall':
- ensure => $shorewall::ensure_version,
- }
+ ensure_packages({ 'shorewall' => { ensure => $shorewall::ensure_version }})
# This file has to be managed in place, so shorewall can find it
file {