incubator-bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r1371451 - in /incubator/bigtop/branches/branch-0.4/bigtop-deploy/puppet: manifests/site.pp modules/hadoop-zookeeper/manifests/init.pp
Date Thu, 09 Aug 2012 20:34:48 GMT
Author: rvs
Date: Thu Aug  9 20:34:48 2012
New Revision: 1371451

URL: http://svn.apache.org/viewvc?rev=1371451&view=rev
Log:
BIGTOP-673. JDK dependency specification in puppet manifest should be configurable (Masatake
Iwasaki via ptr)

Modified:
    incubator/bigtop/branches/branch-0.4/bigtop-deploy/puppet/manifests/site.pp
    incubator/bigtop/branches/branch-0.4/bigtop-deploy/puppet/modules/hadoop-zookeeper/manifests/init.pp

Modified: incubator/bigtop/branches/branch-0.4/bigtop-deploy/puppet/manifests/site.pp
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/branch-0.4/bigtop-deploy/puppet/manifests/site.pp?rev=1371451&r1=1371450&r2=1371451&view=diff
==============================================================================
--- incubator/bigtop/branches/branch-0.4/bigtop-deploy/puppet/manifests/site.pp (original)
+++ incubator/bigtop/branches/branch-0.4/bigtop-deploy/puppet/manifests/site.pp Thu Aug  9
20:34:48 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/branches/branch-0.4/bigtop-deploy/puppet/modules/hadoop-zookeeper/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/branch-0.4/bigtop-deploy/puppet/modules/hadoop-zookeeper/manifests/init.pp?rev=1371451&r1=1371450&r2=1371451&view=diff
==============================================================================
--- incubator/bigtop/branches/branch-0.4/bigtop-deploy/puppet/modules/hadoop-zookeeper/manifests/init.pp
(original)
+++ incubator/bigtop/branches/branch-0.4/bigtop-deploy/puppet/modules/hadoop-zookeeper/manifests/init.pp
Thu Aug  9 20:34:48 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":



Mime
View raw message