From 0ba071858db5c4e9c698fd2b67694ba63f40a076 Mon Sep 17 00:00:00 2001
From: "Dustin J. Mitchell" <dustin@mozilla.com>
Date: Wed, 11 Jul 2012 16:52:31 -0500
Subject: Include concat::setup from concat, so users don't need to

---
 manifests/init.pp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'manifests')

diff --git a/manifests/init.pp b/manifests/init.pp
index bd9d751..9866a5d 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -43,9 +43,6 @@
 # There's some regular expression magic to figure out the puppet version but
 # if you're on an older 0.24 version just set $puppetversion = 24
 #
-# Before you can use any of the concat features you should include the
-# class concat::setup somewhere on your node first.
-#
 # DETAIL:
 # We use a helper shell script called concatfragments.sh that gets placed
 # in <Puppet[:vardir]>/concat/bin to do the concatenation.  While this might
@@ -106,6 +103,8 @@ define concat(
   $gnu = undef,
   $order='alpha'
 ) {
+  include concat::setup
+
   $safe_name   = regsubst($name, '/', '_', 'G')
   $concatdir   = $concat::setup::concatdir
   $version     = $concat::setup::majorversion
-- 
cgit v1.2.3