diff options
| author | Kengo Seki <sekikn@apache.org> | 2017-05-23 11:27:37 -0400 |
|---|---|---|
| committer | Kengo Seki <sekikn@apache.org> | 2017-05-23 21:35:07 -0400 |
| commit | ca35f8d27394d707b4cf59b522f0c394e14c534d (patch) | |
| tree | 0992a71b7cd31a25c993ba89680df60666852c87 /bigtop_toolchain | |
| parent | 75eb043b0226549a18069a501479cee08644740d (diff) | |
BIGTOP-2774. gradlew toolchain does not work on Ubuntu 16.04.2/Puppet 3.8.5
Closes #214
Diffstat (limited to 'bigtop_toolchain')
| -rw-r--r-- | bigtop_toolchain/manifests/puppet-modules.pp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/bigtop_toolchain/manifests/puppet-modules.pp b/bigtop_toolchain/manifests/puppet-modules.pp index 3fab254f..38ecca26 100644 --- a/bigtop_toolchain/manifests/puppet-modules.pp +++ b/bigtop_toolchain/manifests/puppet-modules.pp @@ -23,9 +23,14 @@ class bigtop_toolchain::puppet-modules { case $operatingsystem{ /Ubuntu|Debian/: { + if versioncmp($::puppetversion, '4') < 0 { + $version = '--version 2.4.0' + } else { + $version = '' + } exec { 'install-puppet-apt': path => '/usr/bin:/bin', - command => 'puppet module install puppetlabs-apt', + command => "puppet module install puppetlabs-apt ${version}", creates => '/etc/puppet/modules/apt', } } |