diff options
| author | Kevin W Monroe <kevin.monroe@canonical.com> | 2016-05-23 19:28:10 +0000 |
|---|---|---|
| committer | Konstantin Boudnik <cos@apache.org> | 2016-05-26 12:08:09 -0700 |
| commit | 6087e5018259c780b5d7232d5dc85f6373536c04 (patch) | |
| tree | 0d3eb12fdd67a58ec3353067c5223394875005a8 /bigtop-deploy/puppet | |
| parent | 43fb4f9d0bce6252d4795ce0c3e021445857697c (diff) | |
BIGTOP-2455: support pre-installed java env
Signed-off-by: Konstantin Boudnik <cos@apache.org>
Diffstat (limited to 'bigtop-deploy/puppet')
| -rw-r--r-- | bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml | 7 | ||||
| -rw-r--r-- | bigtop-deploy/puppet/manifests/site.pp | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml b/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml index 71e01c76..f592f64c 100644 --- a/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml +++ b/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml @@ -54,6 +54,13 @@ #bigtop::bigtop_repo_uri: "http://mirror.example.com/path/to/mirror/" +# Use a pre-installed java environment. The default value of 'false' will cause +# the configured 'bigtop::jdk_package_name' package to be installed. Setting +# this to 'true' will ignore the configured 'bigtop::jdk_package_name' but +# requires a compatible java environment be avaialble prior to Bigtop +# installation. +#bigtop::jdk_preinstalled: false + # Test-only variable controls if user hdfs' sshkeys should be installed to allow # for passwordless login across the cluster. Required by some integration tests #hadoop::common_hdfs::testonly_hdfs_sshkeys: "no" diff --git a/bigtop-deploy/puppet/manifests/site.pp b/bigtop-deploy/puppet/manifests/site.pp index 6e5fd06b..4862b223 100644 --- a/bigtop-deploy/puppet/manifests/site.pp +++ b/bigtop-deploy/puppet/manifests/site.pp @@ -28,6 +28,7 @@ case $operatingsystem { } } +$jdk_preinstalled = hiera("bigtop::jdk_preinstalled", false) $jdk_package_name = hiera("bigtop::jdk_package_name", "jdk") stage {"pre": before => Stage["main"]} @@ -70,6 +71,7 @@ case $operatingsystem { package { $jdk_package_name: ensure => "installed", alias => "jdk", + noop => $jdk_preinstalled, } import "cluster.pp" |