BIGTOP-2920: Cleanup puppet recipies: remove deprecated platforms
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/91e0670d Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/91e0670d Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/91e0670d Branch: refs/heads/master Commit: 91e0670dbe0bee45e685c12efdb4e37b613aa235 Parents: e9ad2b4 Author: Olaf Flebbe <[email protected]> Authored: Sat Nov 11 18:02:34 2017 +0100 Committer: Olaf Flebbe <[email protected]> Committed: Sat Nov 11 18:02:34 2017 +0100 ---------------------------------------------------------------------- bigtop_toolchain/manifests/jdk.pp | 28 ---------------------------- bigtop_toolchain/manifests/packages.pp | 16 ++-------------- 2 files changed, 2 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/91e0670d/bigtop_toolchain/manifests/jdk.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/jdk.pp b/bigtop_toolchain/manifests/jdk.pp index 4e15eb1..c17588c 100644 --- a/bigtop_toolchain/manifests/jdk.pp +++ b/bigtop_toolchain/manifests/jdk.pp @@ -16,26 +16,6 @@ class bigtop_toolchain::jdk { case $::operatingsystem { /Debian/: { - require apt - 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' : ensure => present, } @@ -45,15 +25,7 @@ class bigtop_toolchain::jdk { package { 'openjdk-8-jdk' : ensure => present, - # needed for 14.04 - require => [ Apt::Ppa[ 'http://ppa.launchpad.net/openjdk-r/ppa/ubuntu'], Class['apt::update'] ] } - - apt::key { 'openjdk-ppa': - id => 'eb9b1d8886f44e2a', - server => 'keyserver.ubuntu.com' - } -> - apt::ppa { 'http://ppa.launchpad.net/openjdk-r/ppa/ubuntu': } } /(CentOS|Amazon|Fedora)/: { package { 'java-1.8.0-openjdk-devel' : http://git-wip-us.apache.org/repos/asf/bigtop/blob/91e0670d/bigtop_toolchain/manifests/packages.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/packages.pp b/bigtop_toolchain/manifests/packages.pp index c46f187..8416aca 100644 --- a/bigtop_toolchain/manifests/packages.pp +++ b/bigtop_toolchain/manifests/packages.pp @@ -16,12 +16,6 @@ class bigtop_toolchain::packages { case $operatingsystem{ /(?i:(centos|fedora))/: { - # Fedora 20 and CentOS 7 or above are using mariadb, while CentOS 6 is still mysql - if ($operatingsystem == "CentOS") and ($operatingsystemmajrelease <=6) { - $mysql_devel="mysql-devel" - } else { - $mysql_devel="mariadb-devel" - } $pkgs = [ "unzip", "curl", @@ -47,7 +41,7 @@ class bigtop_toolchain::packages { "cyrus-sasl-devel", "sqlite-devel", "openldap-devel", - $mysql_devel, + "mariadb-devel", "rpm-build", "redhat-rpm-config", "fuse-libs", @@ -157,12 +151,6 @@ class bigtop_toolchain::packages { "libffi-devel" ] } /(Ubuntu|Debian)/: { - # Debian-9 is using mariadb instead of mysql - if ($operatingsystem == "Debian") and ($operatingsystemmajrelease > "8") { - $mysql_dev="libmariadb-dev" - } else { - $mysql_dev="libmysqlclient-dev" - } $pkgs = [ "unzip", "curl", @@ -198,7 +186,7 @@ class bigtop_toolchain::packages { "libsqlite3-dev", "libldap2-dev", "libsasl2-dev", - $mysql_dev, + "libmariadb-dev", "python-setuptools", "libkrb5-dev", "asciidoc",
