aboutsummaryrefslogtreecommitdiff
path: root/bigtop_toolchain
diff options
context:
space:
mode:
authorRJ Nowling <rnowling@gmail.com>2015-09-30 17:18:13 +0200
committerRJ Nowling <rnowling@gmail.com>2015-09-30 17:19:35 +0200
commitbfcef33a7a4ec2cfa221f9ad1b3c2ca3d2a7fdf0 (patch)
tree970f10994bb435743c39be861c52c2999b65009e /bigtop_toolchain
parent266ab0c0e3f94ffd51db06396e705f502afb684b (diff)
downloadbigtop-odpi-bfcef33a7a4ec2cfa221f9ad1b3c2ca3d2a7fdf0.tar.gz
BIGTOP-2080. Investigate removing Scala from the toolchain
Diffstat (limited to 'bigtop_toolchain')
-rw-r--r--bigtop_toolchain/README.md2
-rw-r--r--bigtop_toolchain/manifests/installer.pp1
-rw-r--r--bigtop_toolchain/manifests/scala.pp37
3 files changed, 0 insertions, 40 deletions
diff --git a/bigtop_toolchain/README.md b/bigtop_toolchain/README.md
index 82779843..372ae77a 100644
--- a/bigtop_toolchain/README.md
+++ b/bigtop_toolchain/README.md
@@ -30,8 +30,6 @@ Puppet module for configuring a host for building BigTop. It installs:
**Protobuf 2.5.0**
-**Scala 2.10.3**
-
##Usage
These can be indivdually applied using:
diff --git a/bigtop_toolchain/manifests/installer.pp b/bigtop_toolchain/manifests/installer.pp
index 94783990..246fcafe 100644
--- a/bigtop_toolchain/manifests/installer.pp
+++ b/bigtop_toolchain/manifests/installer.pp
@@ -22,7 +22,6 @@ class bigtop_toolchain::installer {
include bigtop_toolchain::packages
include bigtop_toolchain::env
include bigtop_toolchain::user
- include bigtop_toolchain::scala
stage { 'last':
require => Stage['main'],
diff --git a/bigtop_toolchain/manifests/scala.pp b/bigtop_toolchain/manifests/scala.pp
deleted file mode 100644
index 60868f17..00000000
--- a/bigtop_toolchain/manifests/scala.pp
+++ /dev/null
@@ -1,37 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-class bigtop_toolchain::scala {
-
- case $operatingsystem{
- Debian: {
- package { 'scala' :
- ensure => present
- }
- }
- default: {
- $install_scala_cmd = $operatingsystem ? {
- 'Ubuntu' => '/bin/bash -c "wget http://www.scala-lang.org/files/archive/scala-2.10.3.deb ; dpkg -x ./scala-2.10.3.deb /"',
- /(?i:(SLES|opensuse))/ => '/usr/bin/zypper install -y http://www.scala-lang.org/files/archive/scala-2.10.3.rpm',
- default => '/bin/rpm -U http://www.scala-lang.org/files/archive/scala-2.10.3.rpm'
- }
- exec { "install scala":
- cwd => '/tmp',
- command => $install_scala_cmd,
- unless => "/usr/bin/test -f /usr/bin/scala",
- require => $requires
- }
- }
- }
-}