diff options
| author | R.I.Pienaar <rip@devco.net> | 2011-12-06 09:11:59 -0800 |
|---|---|---|
| committer | R.I.Pienaar <rip@devco.net> | 2011-12-06 09:11:59 -0800 |
| commit | 61c8d5c75b00e7c28d316ef427f43fd2d6817c76 (patch) | |
| tree | e41cba29bcb6d4f1d3059996c471a910d01ed800 /manifests/setup.pp | |
| parent | 0cd6bacfc92e581a988c2c82cc23472dff63a8b0 (diff) | |
| parent | 772241575315a4881ec0e01ac12ee6549970ef30 (diff) | |
| download | puppet-concat-61c8d5c75b00e7c28d316ef427f43fd2d6817c76.tar.gz puppet-concat-61c8d5c75b00e7c28d316ef427f43fd2d6817c76.tar.bz2 | |
Merge pull request #11 from cwarden/fully-qualify
Fix use of unqualified variable names
Diffstat (limited to 'manifests/setup.pp')
| -rw-r--r-- | manifests/setup.pp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/manifests/setup.pp b/manifests/setup.pp index 53092ab..2c1d343 100644 --- a/manifests/setup.pp +++ b/manifests/setup.pp @@ -13,12 +13,13 @@ # # It also copies out the concatfragments.sh file to /usr/local/bin class concat::setup { + $id = $::id $root_group = $id ? { root => 0, default => $id } - $concatdir = $concat_basedir - $majorversion = regsubst($puppetversion, '^[0-9]+[.]([0-9]+)[.][0-9]+$', '\1') + $concatdir = $::concat_basedir + $majorversion = regsubst($::puppetversion, '^[0-9]+[.]([0-9]+)[.][0-9]+$', '\1') file{"${concatdir}/bin/concatfragments.sh": owner => $id, |