You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by co...@apache.org on 2017/07/19 05:01:27 UTC

bigtop git commit: BIGTOP-2849. Cannot build bigtop/slaves-ubuntu-16.04 with fresh built puppet image

Repository: bigtop
Updated Branches:
  refs/heads/master ed2f124f9 -> 047dd8d8e


BIGTOP-2849. Cannot build bigtop/slaves-ubuntu-16.04 with fresh built puppet image


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/047dd8d8
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/047dd8d8
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/047dd8d8

Branch: refs/heads/master
Commit: 047dd8d8e3878a273fe6c15143614e3e39c56ac3
Parents: ed2f124
Author: Konstantin Boudnik <ko...@epam.com>
Authored: Tue Jul 18 19:48:44 2017 -0700
Committer: Konstantin Boudnik <ko...@epam.com>
Committed: Tue Jul 18 19:48:44 2017 -0700

----------------------------------------------------------------------
 bigtop_toolchain/bin/puppetize.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/047dd8d8/bigtop_toolchain/bin/puppetize.sh
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/bin/puppetize.sh b/bigtop_toolchain/bin/puppetize.sh
index c0be109..41583ee 100755
--- a/bigtop_toolchain/bin/puppetize.sh
+++ b/bigtop_toolchain/bin/puppetize.sh
@@ -86,5 +86,9 @@ puppet module install puppetlabs-stdlib
 
 case ${ID} in
    debian|ubuntu)
-      puppet module install puppetlabs-apt;;
+       version=""
+       if [ `puppet --version | cut -c1` -lt "4" ]; then
+           version="--version 2.4.0"
+       fi
+      puppet module install puppetlabs-apt $version;;
 esac