You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by ja...@apache.org on 2014/12/17 03:21:57 UTC
bigtop git commit: BIGTOP-1555. Remove mapred-app from docs or code
snippet (post-BIGTOP-1522), cleanup vagrant-puppet to core components.
Repository: bigtop
Updated Branches:
refs/heads/master e7646c67d -> ce962dd5a
BIGTOP-1555. Remove mapred-app from docs or code snippet (post-BIGTOP-1522), cleanup vagrant-puppet to core components.
Signed-off-by: jayunit100 <ja...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/ce962dd5
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/ce962dd5
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/ce962dd5
Branch: refs/heads/master
Commit: ce962dd5ab1228f73cba654cae5c448f28df231b
Parents: e7646c6
Author: evans_ye <in...@gmail.com>
Authored: Fri Dec 12 22:05:16 2014 +0800
Committer: jayunit100 <ja...@apache.org>
Committed: Tue Dec 16 21:21:34 2014 -0500
----------------------------------------------------------------------
bigtop-deploy/puppet/config/site.csv.example | 2 +-
bigtop-deploy/vm/docker-puppet/README.md | 2 +-
bigtop-deploy/vm/docker-puppet/provision.sh | 2 +-
bigtop-deploy/vm/vagrant-puppet/README.md | 21 +++++++++++++++++++-
bigtop-deploy/vm/vagrant-puppet/Vagrantfile | 6 ++++--
.../vm/vagrant-puppet/vagrantconfig.yaml | 5 +++--
6 files changed, 30 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/ce962dd5/bigtop-deploy/puppet/config/site.csv.example
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/config/site.csv.example b/bigtop-deploy/puppet/config/site.csv.example
index 820934e..60c88eb 100644
--- a/bigtop-deploy/puppet/config/site.csv.example
+++ b/bigtop-deploy/puppet/config/site.csv.example
@@ -18,7 +18,7 @@ bigtop_yumrepo_uri,http://mirror.example.com/path/to/mirror/
# "$components" list. If $components isn't set then everything in the stack will
# be installed as usual. Otherwise only a specified list will be set
# Possible elements:
-# hadoop,yarn,hbase,mapred-app,flume,solrcloud,spark,oozie,hcat,sqoop,httpfs,
+# hadoop,yarn,hbase,tachyon,flume,solrcloud,spark,oozie,hcat,sqoop,httpfs,
# hue,mahout,giraph,crunch,pig,hive,zookeeper
# Example (to deploy only HDFS and YARN server and gateway parts)
#components,hadoop,yarn
http://git-wip-us.apache.org/repos/asf/bigtop/blob/ce962dd5/bigtop-deploy/vm/docker-puppet/README.md
----------------------------------------------------------------------
diff --git a/bigtop-deploy/vm/docker-puppet/README.md b/bigtop-deploy/vm/docker-puppet/README.md
index c57a6b5..abc64b6 100644
--- a/bigtop-deploy/vm/docker-puppet/README.md
+++ b/bigtop-deploy/vm/docker-puppet/README.md
@@ -169,7 +169,7 @@ Note: If running on OS X or Windows, the boot2docker VM should be reloaded after
* Choose the ecosystem you want to be deployed by modifying components in provision.sh.
```
- components,hadoop,hbase,yarn,mapred-app,...
+ components,hadoop,hbase,yarn,...
```
By default, Apache Hadoop, YARN, and Apache HBase will be installed.
http://git-wip-us.apache.org/repos/asf/bigtop/blob/ce962dd5/bigtop-deploy/vm/docker-puppet/provision.sh
----------------------------------------------------------------------
diff --git a/bigtop-deploy/vm/docker-puppet/provision.sh b/bigtop-deploy/vm/docker-puppet/provision.sh
index 270c7ef..670c6c6 100755
--- a/bigtop-deploy/vm/docker-puppet/provision.sh
+++ b/bigtop-deploy/vm/docker-puppet/provision.sh
@@ -32,5 +32,5 @@ hadoop_head_node,$1
hadoop_storage_dirs,/data/1,/data/2
bigtop_yumrepo_uri,http://bigtop01.cloudera.org:8080/view/Releases/job/Bigtop-0.8.0/label=centos6/6/artifact/output/
jdk_package_name,java-1.7.0-openjdk-devel.x86_64
-components,hadoop,hbase,yarn,mapred-app
+components,hadoop,hbase,yarn
EOF
http://git-wip-us.apache.org/repos/asf/bigtop/blob/ce962dd5/bigtop-deploy/vm/vagrant-puppet/README.md
----------------------------------------------------------------------
diff --git a/bigtop-deploy/vm/vagrant-puppet/README.md b/bigtop-deploy/vm/vagrant-puppet/README.md
index 001a262..e1e3d48 100644
--- a/bigtop-deploy/vm/vagrant-puppet/README.md
+++ b/bigtop-deploy/vm/vagrant-puppet/README.md
@@ -54,11 +54,30 @@ vagrant up
num_instances: 5
```
+5) Test on local built packages is available by:
+
+first, build up local yum repo
+
+```
+cd bigtop; ./gradlew tachyon-yum
+```
+
+and then enable local yum in vagrantconfig.yaml
+
+```
+enable_local_yum: true
+```
+
+finally, spin up the cluster
+```
+vagrant up
+```
+
##Configure Apache Hadoop ecosystem components
* Choose the ecosystem you want to be deployed by modifying components in vagrantconfig.yaml
```
-components: "hadoop,hbase,yarn,mapred-app,..."
+components: "hadoop,hbase,yarn,..."
```
By default, Apache Hadoop, YARN, and Apache HBase will be installed.
http://git-wip-us.apache.org/repos/asf/bigtop/blob/ce962dd5/bigtop-deploy/vm/vagrant-puppet/Vagrantfile
----------------------------------------------------------------------
diff --git a/bigtop-deploy/vm/vagrant-puppet/Vagrantfile b/bigtop-deploy/vm/vagrant-puppet/Vagrantfile
index 05a66c2..3fe1f8b 100755
--- a/bigtop-deploy/vm/vagrant-puppet/Vagrantfile
+++ b/bigtop-deploy/vm/vagrant-puppet/Vagrantfile
@@ -71,8 +71,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# This is a update to allow dev packages
# Force success - not worried if this step fails, since we generally only use it for development.
- bigtop.vm.provision "shell", inline: "sudo echo \"gpgcheck=0\" >> /etc/yum.conf"
- bigtop.vm.provision "shell", inline: "sudo yum-config-manager --add-repo file:///bigtop-home/output ; true"
+ if CONF['enable_local_yum'] then
+ bigtop.vm.provision "shell", inline: "sudo echo \"gpgcheck=0\" >> /etc/yum.conf"
+ bigtop.vm.provision "shell", inline: "sudo yum-config-manager --add-repo file:///bigtop-home/output ; true"
+ end
# carry on w/ installation
bigtop.vm.provision "shell", path: "../utils/setup-env.sh"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/ce962dd5/bigtop-deploy/vm/vagrant-puppet/vagrantconfig.yaml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/vm/vagrant-puppet/vagrantconfig.yaml b/bigtop-deploy/vm/vagrant-puppet/vagrantconfig.yaml
index 4306dbb..1c0f87d 100644
--- a/bigtop-deploy/vm/vagrant-puppet/vagrantconfig.yaml
+++ b/bigtop-deploy/vm/vagrant-puppet/vagrantconfig.yaml
@@ -1,6 +1,7 @@
-memory_size: 6024
+memory_size: 4096
number_cpus: 1
box: "puppetlabs/centos-6.5-64-nocm"
repo: "http://bigtop01.cloudera.org:8080/view/Releases/job/Bigtop-0.8.0/label=centos6/6/artifact/output/"
num_instances: 1
-components: "hadoop,yarn,mapred-app,tachyon"
+components: "hadoop,yarn"
+enable_local_yum: false