openstack
/
fuel-library
Code Issues Proposed changes

remove very-very-very-old puppet workarround

This commit is contained in:
Sergey Vasilenko 2013-06-24 19:46:13 +04:00
parent 8b29247d13
commit c3401fa7df
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
deployment/puppet/concat/manifests/setup.pp
View File

@ -25,16 +25,11 @@ class concat::setup {
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":
owner => $id,
group => $root_group,
mode => '0755',
source => $majorversion ? {
24 => 'puppet:///concat/concatfragments.sh',
default => 'puppet:///modules/concat/concatfragments.sh'
};
source => 'puppet:///modules/concat/concatfragments.sh';
[ $concatdir, "${concatdir}/bin" ]:
ensure => directory,