aboutsummaryrefslogtreecommitdiff
path: root/bigtop_toolchain
diff options
context:
space:
mode:
authorOlaf Flebbe <of@oflebbe.de>2015-08-30 15:02:34 +0200
committerOlaf Flebbe <of@oflebbe.de>2015-09-14 20:00:16 +0200
commit68f5844afd9d8d434692bb06862c91daa53102b9 (patch)
treec5d11fc3c987f81e32acc9d303cd39d8ba5e6a4b /bigtop_toolchain
parentfc6a424206cd3d84317d2640e52730eee3749b1b (diff)
downloadbigtop-odpi-68f5844afd9d8d434692bb06862c91daa53102b9.tar.gz
BIGTOP-1936: Provide JDK8 for Bigtop
Diffstat (limited to 'bigtop_toolchain')
-rw-r--r--bigtop_toolchain/manifests/jdk.pp36
1 files changed, 34 insertions, 2 deletions
diff --git a/bigtop_toolchain/manifests/jdk.pp b/bigtop_toolchain/manifests/jdk.pp
index 12fe314e..6c71ec42 100644
--- a/bigtop_toolchain/manifests/jdk.pp
+++ b/bigtop_toolchain/manifests/jdk.pp
@@ -16,20 +16,52 @@
class bigtop_toolchain::jdk {
case $operatingsystem{
- Debian,Ubuntu: {
+ Debian: {
+ include apt
+ include apt::backports
+
package { 'openjdk-7-jdk' :
ensure => present
}
+ package { 'openjdk-8-jdk' :
+ ensure => present,
+ }
+
+ Apt::Source['backports'] -> Exec['apt-update']
}
- /(CentOS|Fedora|Amazon)/: {
+ Ubuntu: {
+ include apt
+
+ package { 'openjdk-7-jdk' :
+ ensure => present
+ }
+ package { 'openjdk-8-jdk' :
+ ensure => present,
+ }
+
+ apt::key { 'openjdk-ppa':
+ id => 'eb9b1d8886f44e2a',
+ server => 'keyserver.ubuntu.com'
+ } ->
+ apt::ppa { 'http://ppa.launchpad.net/openjdk-r/ppa/ubuntu': }
+
+ Apt::Ppa['http://ppa.launchpad.net/openjdk-r/ppa/ubuntu'] -> Exec['apt-update']
+ }
+ /(CentOS|Fedora|Amazon|OpenSuSE)/: {
package { 'java-1.7.0-openjdk-devel' :
ensure => present
}
+ package { 'java-1.8.0-openjdk-devel' :
+ ensure => present
+ }
}
/(OpenSuSE)/: {
package { 'java-1_7_0-openjdk-devel' :
ensure => present
}
+ package { 'java-1_8_0-openjdk-devel' :
+ ensure => present
+ }
}
}
}