Merge pull request #41 from raphaabreu/master

Changing messages related to pluginsync to indicate where this setting should be put.
This commit is contained in:
R.I.Pienaar 2013-02-24 04:27:54 -08:00
commit 6f4f617fd1
2 changed files with 3 additions and 2 deletions

View file

@ -80,7 +80,8 @@ manifest files.
Known Issues: Known Issues:
------------- -------------
* Since puppet-concat now relies on a fact for the concat directory, * Since puppet-concat now relies on a fact for the concat directory,
you will need to set up pluginsync = true for at least the first run. you will need to set up pluginsync = true on the [master] section of your
node's '/etc/puppet/puppet.conf' for at least the first run.
You have this issue if puppet fails to run on the client and you have You have this issue if puppet fails to run on the client and you have
a message similar to a message similar to
"err: Failed to apply catalog: Parameter path failed: File "err: Failed to apply catalog: Parameter path failed: File

View file

@ -22,7 +22,7 @@ class concat::setup {
if $::concat_basedir { if $::concat_basedir {
$concatdir = $::concat_basedir $concatdir = $::concat_basedir
} else { } else {
fail ("\$concat_basedir not defined. Try running again with pluginsync enabled") fail ("\$concat_basedir not defined. Try running again with pluginsync=true on the [master] section of your node's '/etc/puppet/puppet.conf'.")
} }
$majorversion = regsubst($::puppetversion, '^[0-9]+[.]([0-9]+)[.][0-9]+$', '\1') $majorversion = regsubst($::puppetversion, '^[0-9]+[.]([0-9]+)[.][0-9]+$', '\1')