summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorR.I.Pienaar <rip@devco.net>2012-05-29 19:30:35 +0100
committerR.I.Pienaar <rip@devco.net>2012-05-29 19:30:35 +0100
commit52d5f36c757ce34b3d0f4f322bca34992b43c8af (patch)
treec87669a92e8674302e13e218b7cd15b2ab40685f /manifests
parent12f38d86eebb8ee45ce748bd7fc147574a805f33 (diff)
parent1c0e725ba72f177f4317379c6f59107dfe615147 (diff)
downloadpuppet-concat-52d5f36c757ce34b3d0f4f322bca34992b43c8af.tar.gz
puppet-concat-52d5f36c757ce34b3d0f4f322bca34992b43c8af.tar.bz2
Merge branch 'master' of github.com:ripienaar/puppet-concat
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp12
-rw-r--r--manifests/setup.pp14
2 files changed, 18 insertions, 8 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 48aeec3..0b3ed56 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -31,10 +31,14 @@
# to control that and thus control the order the final file gets built in.
#
# SETUP:
-# The class concat::setup defines a variable $concatdir - you should set this
-# to a directory where you want all the temporary files and fragments to be
-# stored. Avoid placing this somewhere like /tmp since you should never
-# delete files here, puppet will manage them.
+# The class concat::setup uses the fact concat_basedir to define the variable
+# $concatdir, where all the temporary files and fragments will be
+# durably stored. The fact concat_basedir will be set up on the client to
+# <Puppet[:vardir]>/concat, so you will be able to run different setup/flavours
+# of puppet clients.
+# However, since this requires the file lib/facter/concat_basedir.rb to be
+# deployed on the clients, so you will have to set "pluginsync = true" on
+# both the master and client, at least for the first run.
#
# 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
diff --git a/manifests/setup.pp b/manifests/setup.pp
index ce3f7ea..38aeb96 100644
--- a/manifests/setup.pp
+++ b/manifests/setup.pp
@@ -1,8 +1,8 @@
# Sets up the concat system.
#
-# $concatdir should point to a place where you wish the fragments to
-# live. This should not be somewhere like /tmp since ideally these files
-# should not be deleted ever, puppet should always manage them
+# $concatdir is where the fragments live and is set on the fact concat_basedir.
+# Since puppet should always manage files in $concatdir and they should
+# not be deleted ever, /tmp is not an option.
#
# $puppetversion should be either 24 or 25 to enable a 24 compatible
# mode, in 24 mode you might see phantom notifies this is a side effect
@@ -18,7 +18,13 @@ class concat::setup {
root => 0,
default => $id
}
- $concatdir = $::concat_basedir
+
+ if $::concat_basedir {
+ $concatdir = $::concat_basedir
+ } else {
+ fail ("\$concat_basedir not defined. Try running again with pluginsync enabled")
+ }
+
$majorversion = regsubst($::puppetversion, '^[0-9]+[.]([0-9]+)[.][0-9]+$', '\1')
file{"${concatdir}/bin/concatfragments.sh":