Author: rvs
Date: Mon Dec 19 18:06:55 2011
New Revision: 1220877
URL: http://svn.apache.org/viewvc?rev=1220877&view=rev
Log:
Merging trunk
Added:
incubator/bigtop/branches/RCs/bigtop-deploy/vm/
incubator/bigtop/branches/RCs/bigtop-deploy/vm/boxgrinder/
incubator/bigtop/branches/RCs/bigtop-deploy/vm/boxgrinder/bigtop_hadoop.appl
Modified:
incubator/bigtop/branches/RCs/README
incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-sqoop/manifests/init.pp
incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
incubator/bigtop/branches/RCs/bigtop.mk
Modified: incubator/bigtop/branches/RCs/README
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/README?rev=1220877&r1=1220876&r2=1220877&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/README (original)
+++ incubator/bigtop/branches/RCs/README Mon Dec 19 18:06:55 2011
@@ -43,6 +43,7 @@ Building Bigtop requires the following t
* libz-dev
* sharutils
* libfuse-dev
+* libssl-dev
On Debian-based systems one also needs
Modified:
incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-sqoop/manifests/init.pp
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-sqoop/manifests/init.pp?rev=1220877&r1=1220876&r2=1220877&view=diff
==============================================================================
---
incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-sqoop/manifests/init.pp
(original)
+++
incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop-sqoop/manifests/init.pp
Mon Dec 19 18:06:55 2011
@@ -24,6 +24,7 @@ class hadoop-sqoop {
# extra jars to sqoop classpath
file { "/usr/lib/sqoop/lib/mysql-connector-java-5.1.12.jar":
ensure => "/usr/share/java/mysql-connector-java-5.1.12.jar",
+ require => Package["sqoop"],
}
}
Modified:
incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp?rev=1220877&r1=1220876&r2=1220877&view=diff
==============================================================================
---
incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
(original)
+++
incubator/bigtop/branches/RCs/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
Mon Dec 19 18:06:55 2011
@@ -86,8 +86,10 @@ class hadoop {
ensure => running,
hasstatus => true,
subscribe => [Package["hadoop-datanode"],
File["/etc/hadoop/conf/core-site.xml"], File["/etc/hadoop/conf/hdfs-site.xml"],
File["/etc/hadoop/conf/hadoop-env.sh"]],
- require => [ Package["hadoop-datanode"] ],
- } <- file { $dirs:
+ require => [ Package["hadoop-datanode"], File[$dirs] ],
+ }
+
+ file { $dirs:
ensure => directory,
owner => hdfs,
group => hdfs,
@@ -135,8 +137,10 @@ class hadoop {
user => "hdfs",
command => "/bin/bash -c 'yes Y | hadoop namenode -format >>
/tmp/nn.format.log 2>&1'",
creates => inline_template("<%= hadoop_storage_locations.split(';')[0]
%>/namenode/image"),
- require => [Package["hadoop-namenode"]],
- } <- file { $dirs:
+ require => [ Package["hadoop-namenode"], File[$dirs] ],
+ }
+
+ file { $dirs:
ensure => directory,
owner => hdfs,
group => hdfs,
@@ -166,8 +170,10 @@ class hadoop {
ensure => running,
hasstatus => true,
subscribe => [Package["hadoop-jobtracker"],
File["/etc/hadoop/conf/core-site.xml"],
File["/etc/hadoop/conf/mapred-site.xml"],
File["/etc/hadoop/conf/hadoop-env.sh"]],
- require => [ Package["hadoop-jobtracker"] ]
- } <- file { $dirs:
+ require => [ Package["hadoop-jobtracker"], File[$dirs] ],
+ }
+
+ file { $dirs:
ensure => directory,
owner => mapred,
group => mapred,
@@ -200,8 +206,10 @@ class hadoop {
ensure => running,
hasstatus => true,
subscribe => [Package["hadoop-tasktracker"],
File["/etc/hadoop/conf/core-site.xml"],
File["/etc/hadoop/conf/mapred-site.xml"],
File["/etc/hadoop/conf/hadoop-env.sh"]],
- require => [ Package["hadoop-tasktracker"],
File["/etc/hadoop/conf/taskcontroller.cfg"] ],
- } <- file { $dirs:
+ require => [ Package["hadoop-tasktracker"],
File["/etc/hadoop/conf/taskcontroller.cfg"], File[$dirs] ],
+ }
+
+ file { $dirs:
ensure => directory,
owner => mapred,
group => mapred,
Added:
incubator/bigtop/branches/RCs/bigtop-deploy/vm/boxgrinder/bigtop_hadoop.appl
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop-deploy/vm/boxgrinder/bigtop_hadoop.appl?rev=1220877&view=auto
==============================================================================
---
incubator/bigtop/branches/RCs/bigtop-deploy/vm/boxgrinder/bigtop_hadoop.appl
(added)
+++
incubator/bigtop/branches/RCs/bigtop-deploy/vm/boxgrinder/bigtop_hadoop.appl
Mon Dec 19 18:06:55 2011
@@ -0,0 +1,26 @@
+name: bigtop_hadoop
+summary: Apache Bigtop VM with Apache Hadoop
+version: 2
+release: 0
+os:
+ name: centos
+ version: 6
+ password: bigtop
+hardware:
+ partitions:
+ "/":
+ size: 2
+ type: ext3
+repos:
+ - name: "Bigtop-jenkins"
+ baseurl:
"http://www.apache.org/dist/incubator/bigtop/stable/repos/centos6/";
+ ephemeral: true
+packages:
+ - @core
+ - shadow-utils
+ - passwd
+ - java-1.6.0-openjdk-devel
+ - hadoop-conf-pseudo
+post:
+ base:
+ - "/usr/bin/yes Y | su hdfs /bin/bash -c '/usr/bin/hadoop namenode
-format'"
Modified: incubator/bigtop/branches/RCs/bigtop.mk
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/RCs/bigtop.mk?rev=1220877&r1=1220876&r2=1220877&view=diff
==============================================================================
--- incubator/bigtop/branches/RCs/bigtop.mk (original)
+++ incubator/bigtop/branches/RCs/bigtop.mk Mon Dec 19 18:06:55 2011
@@ -36,8 +36,7 @@ ZOOKEEPER_PKG_VERSION=3.4.1
ZOOKEEPER_RELEASE_VERSION=1
ZOOKEEPER_TARBALL_DST=zookeeper-$(ZOOKEEPER_BASE_VERSION).tar.gz
ZOOKEEPER_TARBALL_SRC=$(ZOOKEEPER_TARBALL_DST)
-#ZOOKEEPER_SITE=$(APACHE_MIRROR)/zookeeper/zookeeper-3.4.0/
-ZOOKEEPER_SITE=http://people.apache.org/~mahadev/zookeeper-3.4.1-candidate-0/
+ZOOKEEPER_SITE=$(APACHE_MIRROR)/zookeeper/zookeeper-$(ZOOKEEPER_BASE_VERSION)/
$(eval $(call PACKAGE,zookeeper,ZOOKEEPER))
# HBase
