From b05a6522bdbd581bb23ceaaf89d652715c96c44d Mon Sep 17 00:00:00 2001 From: 7u83 <7u83@mail.ru> Date: Thu, 23 Jul 2020 19:55:47 +0000 Subject: [PATCH] jdk installation and java_home ist set in params.pp --- manifests/init.pp | 15 +++++++++++++-- manifests/params.pp | 15 ++++++++++++++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 0f66ca4..11c9778 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -3,7 +3,14 @@ # class plnxtools( - $opt_dir = $plnxtools::params::opt_dir + $opt_dir = $plnxtools::params::opt_dir, + + # a list of packages to install jdks + $jdks = $plnxtools::params::jdks, + + # default JAVA_HOME + $java_home = $plnxtools::params::java_home, + ) inherits plnxtools::params{ @@ -12,6 +19,10 @@ inherits plnxtools::params{ ensure => directory } + # + # For most tools FreeBSD needs to bash installed + # accassible by /bin/bash + # if $::osfamily == 'FreeBSD' { package {"bash": ensure => installed @@ -22,7 +33,7 @@ inherits plnxtools::params{ } } - package { 'openjdk11': + package { $jdks: ensure => installed } diff --git a/manifests/params.pp b/manifests/params.pp index 6509da8..9d33ebf 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -1,4 +1,17 @@ +# +# params.pp +# class plnxtools::params{ - $opt_dir = "/opt" + $opt_dir = "/opt" + + case $::osfamily { + 'FreeBSD':{ + $jdks = ['openjdk11'] + $java_home = "/usr/local/openjdk11" + } + default: { + + }} + }