diff options
author | Evans Ye <evansye@apache.org> | 2017-07-05 14:42:54 +0800 |
---|---|---|
committer | Evans Ye <evansye@apache.org> | 2017-07-06 23:21:23 +0800 |
commit | 6f7e97e93393d7c078d8928cc666b2bb03147f32 (patch) | |
tree | fc5eb1ad12ed8a214859e63653cd0fe49ee7bdc5 | |
parent | 8054d01c503e6d04837cde246e43344d68f02014 (diff) |
BIGTOP-2832. Toolchain failed to install on Debian 8
-rw-r--r-- | bigtop_toolchain/manifests/jdk.pp | 17 | ||||
-rw-r--r-- | bigtop_toolchain/manifests/packages.pp | 2 |
2 files changed, 17 insertions, 2 deletions
diff --git a/bigtop_toolchain/manifests/jdk.pp b/bigtop_toolchain/manifests/jdk.pp index 8c1518b2..4e15eb16 100644 --- a/bigtop_toolchain/manifests/jdk.pp +++ b/bigtop_toolchain/manifests/jdk.pp @@ -17,8 +17,23 @@ class bigtop_toolchain::jdk { case $::operatingsystem { /Debian/: { require apt - unless $os[release][major] > "8" { + unless $operatingsystemmajrelease > "8" { + # we pin openjdk-8-* and ca-certificates-java to backports require apt::backports + + apt::pin { 'backports_jdk': + packages => 'openjdk-8-*', + priority => 500, + release => 'jessie-backports', + } -> + apt::pin { 'backports_ca': + packages => 'ca-certificates-java', + priority => 500, + release => 'jessie-backports', + } -> + exec {'own_update': + command => '/usr/bin/apt-get update' + } -> Package['openjdk-8-jdk'] } package { 'openjdk-8-jdk' : diff --git a/bigtop_toolchain/manifests/packages.pp b/bigtop_toolchain/manifests/packages.pp index 6101e357..7a15d3b5 100644 --- a/bigtop_toolchain/manifests/packages.pp +++ b/bigtop_toolchain/manifests/packages.pp @@ -159,7 +159,7 @@ class bigtop_toolchain::packages { ] } /(Ubuntu|Debian)/: { # Debian-9 is using mariadb instead of mysql - if ($operatingsystem == "Debian") and ($os[release][major] > "8") { + if ($operatingsystem == "Debian") and ($operatingsystemmajrelease > "8") { $mysql_dev="libmariadb-dev" } else { $mysql_dev="libmysqlclient-dev" |