Repository: bigtop Updated Branches: refs/heads/master 75eb043b0 -> ca35f8d27
BIGTOP-2774. gradlew toolchain does not work on Ubuntu 16.04.2/Puppet 3.8.5 Closes #214 Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/ca35f8d2 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/ca35f8d2 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/ca35f8d2 Branch: refs/heads/master Commit: ca35f8d27394d707b4cf59b522f0c394e14c534d Parents: 75eb043 Author: Kengo Seki <[email protected]> Authored: Tue May 23 11:27:37 2017 -0400 Committer: Kengo Seki <[email protected]> Committed: Tue May 23 21:35:07 2017 -0400 ---------------------------------------------------------------------- bigtop_toolchain/manifests/puppet-modules.pp | 7 ++++++- build.gradle | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/ca35f8d2/bigtop_toolchain/manifests/puppet-modules.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/puppet-modules.pp b/bigtop_toolchain/manifests/puppet-modules.pp index 3fab254..38ecca2 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', } } http://git-wip-us.apache.org/repos/asf/bigtop/blob/ca35f8d2/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index f9d4a69..0faa91b 100644 --- a/build.gradle +++ b/build.gradle @@ -226,7 +226,7 @@ task toolchain(type:Exec, description: 'Setup dev. env via toolchain; Requires: Puppet, sudo', group: DEVENV_GROUP) { def command = [ - 'sudo', 'puppet', 'apply', '-d', + 'sudo', 'puppet', 'apply', '-d', '--parser', 'future', "--modulepath=${projectDir.absolutePath}:/etc/puppet/modules", '-e', 'include bigtop_toolchain::installer' ]
