You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by ev...@apache.org on 2017/07/01 13:36:48 UTC
[04/50] [abbrv] bigtop git commit: BIGTOP-2774. gradlew toolchain
does not work on Ubuntu 16.04.2/Puppet 3.8.5
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/1aa5667b
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/1aa5667b
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/1aa5667b
Branch: refs/heads/branch-1.2
Commit: 1aa5667b35f8c9ebb02b6944950ff32b6551ff64
Parents: 55f8033
Author: Kengo Seki <se...@apache.org>
Authored: Tue May 23 11:27:37 2017 -0400
Committer: Evans Ye <ev...@apache.org>
Committed: Sat Jul 1 12:52:53 2017 +0000
----------------------------------------------------------------------
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/1aa5667b/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/1aa5667b/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index c209915..258bed5 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'
]