[16/51] [abbrv] bigtop git commit: BIGTOP-2455: support pre-installed java env

[of...@apache.org]

BIGTOP-2455: support pre-installed java env

Signed-off-by: Konstantin Boudnik <co...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/6087e501
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/6087e501
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/6087e501

Branch: refs/heads/BIGTOP-2253
Commit: 6087e5018259c780b5d7232d5dc85f6373536c04
Parents: 43fb4f9
Author: Kevin W Monroe <ke...@canonical.com>
Authored: Mon May 23 19:28:10 2016 +0000
Committer: Konstantin Boudnik <co...@apache.org>
Committed: Thu May 26 12:08:09 2016 -0700

----------------------------------------------------------------------
 bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml | 7 +++++++
 bigtop-deploy/puppet/manifests/site.pp             | 2 ++
 2 files changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/6087e501/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml b/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml
index 71e01c7..f592f64 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"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/6087e501/bigtop-deploy/puppet/manifests/site.pp
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/manifests/site.pp b/bigtop-deploy/puppet/manifests/site.pp
index 6e5fd06..4862b22 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"