remove very-very-very-old puppet workarround
This commit is contained in:
parent
8b29247d13
commit
c3401fa7df
@ -25,16 +25,11 @@ class concat::setup {
|
|||||||
fail ("\$concat_basedir not defined. Try running again with pluginsync enabled")
|
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":
|
file{"${concatdir}/bin/concatfragments.sh":
|
||||||
owner => $id,
|
owner => $id,
|
||||||
group => $root_group,
|
group => $root_group,
|
||||||
mode => '0755',
|
mode => '0755',
|
||||||
source => $majorversion ? {
|
source => 'puppet:///modules/concat/concatfragments.sh';
|
||||||
24 => 'puppet:///concat/concatfragments.sh',
|
|
||||||
default => 'puppet:///modules/concat/concatfragments.sh'
|
|
||||||
};
|
|
||||||
|
|
||||||
[ $concatdir, "${concatdir}/bin" ]:
|
[ $concatdir, "${concatdir}/bin" ]:
|
||||||
ensure => directory,
|
ensure => directory,
|
||||||
|
Loading…
Reference in New Issue
Block a user