Author: ptr
Date: Mon Jul 9 22:55:34 2012
New Revision: 1359438
URL: http://svn.apache.org/viewvc?rev=1359438&view=rev
Log:
BIGTOP-673. JDK dependency specification in puppet manifest should be
configurable (Masatake Iwasaki via ptr)
Modified:
incubator/bigtop/trunk/bigtop-deploy/puppet/manifests/site.pp
incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-zookeeper/manifests/init.pp
Modified: incubator/bigtop/trunk/bigtop-deploy/puppet/manifests/site.pp
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-deploy/puppet/manifests/site.pp?rev=1359438&r1=1359437&r2=1359438&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-deploy/puppet/manifests/site.pp (original)
+++ incubator/bigtop/trunk/bigtop-deploy/puppet/manifests/site.pp Mon Jul 9
22:55:34 2012
@@ -18,6 +18,7 @@ $puppet_confdir = get_setting("confdir")
$default_yumrepo =
"http://bigtop01.cloudera.org:8080/view/Hadoop%200.23/job/Bigtop-23-matrix/label=centos5/lastSuccessfulBuild/artifact/output/";
$extlookup_datadir="$puppet_confdir/config"
$extlookup_precedence = ["site", "default"]
+$jdk_package_name = extlookup("jdk_package_name", "jdk")
stage {"pre": before => Stage["main"]}
@@ -28,8 +29,9 @@ yumrepo { "Bigtop":
gpgcheck => 0,
}
-package { "jdk":
- ensure => "installed",
+package { $jdk_package_name:
+ ensure => "installed",
+ alias => "jdk",
}
import "cluster.pp"
Modified:
incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-zookeeper/manifests/init.pp
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-zookeeper/manifests/init.pp?rev=1359438&r1=1359437&r2=1359438&view=diff
==============================================================================
---
incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-zookeeper/manifests/init.pp
(original)
+++
incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-zookeeper/manifests/init.pp
Mon Jul 9 22:55:34 2012
@@ -17,6 +17,7 @@ class hadoop-zookeeper {
define client {
package { "zookeeper":
ensure => latest,
+ require => Package["jdk"],
}
}
@@ -25,6 +26,7 @@ class hadoop-zookeeper {
{
package { "zookeeper-server":
ensure => latest,
+ require => Package["jdk"],
}
service { "zookeeper-server":
