aboutsummaryrefslogtreecommitdiff
path: root/bigtop_toolchain
diff options
context:
space:
mode:
authorOlaf Flebbe <of@ofleb.be>2015-12-29 21:44:54 +0100
committerOlaf Flebbe <of@ofleb.be>2015-12-30 10:45:50 +0100
commitc78e635aea166e653b95f07bfd6d1c9b976e0a09 (patch)
tree40820b7b937c847681245da117274652157fb105 /bigtop_toolchain
parent48c02c4929dd9928bd47d11103220b196306cb79 (diff)
downloadbigtop-odpi-c78e635aea166e653b95f07bfd6d1c9b976e0a09.tar.gz
BIGTOP-2191: openjdk-7 is missing in bigtop/slave:ubuntu-14.04-ppc64le docker image
Diffstat (limited to 'bigtop_toolchain')
-rwxr-xr-xbigtop_toolchain/bin/puppetize.sh10
1 files changed, 6 insertions, 4 deletions
diff --git a/bigtop_toolchain/bin/puppetize.sh b/bigtop_toolchain/bin/puppetize.sh
index 6facf14a..de02db42 100755
--- a/bigtop_toolchain/bin/puppetize.sh
+++ b/bigtop_toolchain/bin/puppetize.sh
@@ -39,11 +39,13 @@ case ${ID}-${VERSION_ID} in
yum -y install hostname curl sudo unzip wget puppet
;;
ubuntu-14.04)
- # BIGTOP-2003. A workaround to install newer hiera to get rid of hiera 1.3.0 bug.
apt-get -y install wget
- wget -O /tmp/puppetlabs-release-trusty.deb https://apt.puppetlabs.com/puppetlabs-release-trusty.deb && dpkg -i /tmp/puppetlabs-release-trusty.deb
- rm -f /tmp/puppetlabs-release-trusty.deb
- apt-get update
+ if [ $HOSTTYPE = "x86_64" ] ; then
+ # BIGTOP-2003. A workaround to install newer hiera to get rid of hiera 1.3.0 bug.
+ wget -O /tmp/puppetlabs-release-trusty.deb https://apt.puppetlabs.com/puppetlabs-release-trusty.deb && dpkg -i /tmp/puppetlabs-release-trusty.deb
+ rm -f /tmp/puppetlabs-release-trusty.deb
+ apt-get update
+ fi
apt-get -y install curl sudo unzip puppet software-properties-common
;;
ubuntu-15*)