Menu
▾
▴
bigdata-commit
|
From: <dme...@us...> - 2014-05-08 19:06:34
|
Revision: 8235
http://sourceforge.net/p/bigdata/code/8235
Author: dmekonnen
Date: 2014-05-08 19:06:32 +0000 (Thu, 08 May 2014)
Log Message:
-----------
cleanup
Modified Paths:
--------------
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/Vagrantfile
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/Vagrantfile.aws
Modified: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/Vagrantfile
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/Vagrantfile 2014-05-08 18:33:04 UTC (rev 8234)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/Vagrantfile 2014-05-08 19:06:32 UTC (rev 8235)
@@ -32,25 +32,22 @@
config.vm.provider :aws do |aws, override|
override.vm.box = "dummy"
- aws.access_key_id = "AKIAJ26S27XQRS5LFXCQ"
- aws.secret_access_key = "BPBric3lzzE9lHV3Hwz+vG9TQ/e1fOugytYz1LFV"
- aws.keypair_name = "systap"
+ aws.access_key_id = ENV['AWS_ACCESS_KEY_ID']
+ aws.secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
+ aws.keypair_name = ENV['AWS_KEYPAIR_NAME']
- aws.ami = "ami-a73264ce"
+ aws.ami = ENV['AWS_AMI']
- #
- #
- #
- aws.region = "us-east-1"
- aws.instance_type = "t1.micro"
- aws.security_groups = [ "launch-wizard-4" ]
+ aws.region = ENV['AWS_REGION']
+ aws.instance_type = ENV['AWS_INSTANCE_TYPE']
+ aws.security_groups = [ ENV['AWS_SECURITY_GROUPS'], ENV['AWS_SECURITY_GROUP_PRIVATE'] ]
aws.tags = {
- 'Name' => 'Systap Bigdata'
+ 'Name' => ENV['BIGDATA_HOST_NAME']
}
- override.ssh.username = "ubuntu"
- override.ssh.private_key_path = "/Users/dmekonnen/.ssh/systap.pem"
+ override.ssh.username = ENV['AWS_AMI_USERNAME']
+ override.ssh.private_key_path = ENV['AWS_SSH_PRIVATE_KEY']
end
@@ -70,8 +67,8 @@
}
}
- # config.vm.provision :shell, inline: "sudo apt-get update ; sudo curl -L https://www.opscode.com/chef/install.sh | sudo bash"
- config.vm.provision :shell, inline: "sudo apt-get update"
+ config.vm.provision :shell, inline: "sudo apt-get update ; sudo curl -L https://www.opscode.com/chef/install.sh | sudo bash"
+ # config.vm.provision :shell, inline: "sudo apt-get update"
chef.run_list = [
"recipe[bigdata::nss]"
Modified: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/Vagrantfile.aws
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/Vagrantfile.aws 2014-05-08 18:33:04 UTC (rev 8234)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/Vagrantfile.aws 2014-05-08 19:06:32 UTC (rev 8235)
@@ -10,7 +10,7 @@
# please see the online documentation at vagrantup.com.
config.vm.box = "dummy"
- config.vm.hostname = "systap-bigdata"
+ config.vm.hostname = "bigdata"
config.berkshelf.enabled = true
@@ -23,25 +23,22 @@
# config.berkshelf.except = []
config.vm.provider :aws do |aws, override|
- aws.access_key_id = "AKIAJ26S27XQRS5LFXCQ"
- aws.secret_access_key = "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"
- aws.keypair_name = "systap"
+ aws.access_key_id = ENV['AWS_ACCESS_KEY_ID']
+ aws.secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
+ aws.keypair_name = ENV['AWS_KEYPAIR_NAME']
- aws.ami = "ami-a73264ce"
+ aws.ami = ENV['AWS_AMI']
- #
- #
- #
- aws.region = "us-east-1"
- aws.instance_type = "t1.micro"
- aws.security_groups = [ "launch-wizard-4" ]
+ aws.region = ENV['AWS_REGION']
+ aws.instance_type = ENV['AWS_INSTANCE_TYPE']
+ aws.security_groups = [ ENV['AWS_SECURITY_GROUPS'], ENV['AWS_SECURITY_GROUP_PRIVATE'] ]
aws.tags = {
- 'Name' => 'Systap Bigdata'
+ 'Name' => ENV['BIGDATA_HOST_NAME']
}
- override.ssh.username = "ubuntu"
- override.ssh.private_key_path = "/Users/dmekonnen/.ssh/systap.pem"
+ override.ssh.username = ENV['AWS_AMI_USERNAME']
+ override.ssh.private_key_path = ENV['AWS_SSH_PRIVATE_KEY']
end
config.vm.provision :chef_solo do |chef|
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dme...@us...> - 2014-05-12 16:41:35
|
Revision: 8285
http://sourceforge.net/p/bigdata/code/8285
Author: dmekonnen
Date: 2014-05-12 16:41:31 +0000 (Mon, 12 May 2014)
Log Message:
-----------
update to build bigdata from svn. addition of mapgraph recipe.
Modified Paths:
--------------
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/attributes/default.rb
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/recipes/tomcat.rb
Added Paths:
-----------
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/recipes/mapgraph.rb
Modified: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/attributes/default.rb
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/attributes/default.rb 2014-05-12 15:35:32 UTC (rev 8284)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/attributes/default.rb 2014-05-12 16:41:31 UTC (rev 8285)
@@ -5,7 +5,7 @@
default['bigdata'][:user] = "bigdata"
default['bigdata'][:group] = "bigdata"
-default['bigdata'][:properties] = default['bigdata'][:home] + "RWStore.properties"
+default['bigdata'][:properties] = default['bigdata'][:home] + "/RWStore.properties"
default['bigdata'][:source] = "bigdata-code"
@@ -83,3 +83,6 @@
default['bigdata']['namespace.kb.spo.com.bigdata.btree.BTree.branchingFactor'] = "1024"
default['bigdata']['rdf.sail.bufferCapacity'] = "100000"
# default['bigdata']['rdf.store.AbstractTripleStore.vocabularyClass'] = ""
+
+default['mapgraph'][:source] = "mapgraph-code"
+default['mapgraph'][:svn_branch] = "https://svn.code.sf.net/p/mpgraph/code/trunk"
Added: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/recipes/mapgraph.rb
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/recipes/mapgraph.rb (rev 0)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/recipes/mapgraph.rb 2014-05-12 16:41:31 UTC (rev 8285)
@@ -0,0 +1,33 @@
+#
+# Cookbook Name:: systap-bigdata
+# Recipe:: default
+#
+# Copyright 2013, Systap
+#
+#
+execute "pull mapgraph from svn repo" do
+ user 'ubuntu'
+ group 'ubuntu'
+ cwd "/home/ubuntu"
+ command "svn checkout #{default['mapgraph'][:svn_branch]} #{node['mapgraph'][:source]}"
+end
+
+execute "make mapgraph" do
+ cwd node['mapgraph'][:source]
+ command "make"
+end
+
+execute "test mapgraph" do
+ cwd node['mapgraph'][:source]
+ command "./Algorithms/SSSP/SSSP -g smallRegressionGraphs/small.mtx"
+end
+
+
+#
+# "recursive true" did not work here
+#
+# directory node['bigdata'][:mapgraph_home] do
+# owner 'ec2-user'
+# group 'ec2-user'
+# recursive true
+# end
Modified: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/recipes/tomcat.rb
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/recipes/tomcat.rb 2014-05-12 15:35:32 UTC (rev 8284)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/recipes/tomcat.rb 2014-05-12 16:41:31 UTC (rev 8285)
@@ -106,29 +106,53 @@
owner node['tomcat'][:user]
group node['tomcat'][:group]
mode 00644
- retry_delay 10
+ retry_delay 15
retries 3
end
#
+ # Delete all log files so that the error and warning messages that appeared during the installation
+ # process do not unnecessarily alarm anyone.
+ #
+ execute "remove log files before retart" do
+ cwd "#{node['tomcat'][:log_dir]}"
+ command "rm *"
+ end
+
+
+ #
# The RWStore.properties path is the only property that needs to be adjusted in the web.xml file.
# Using a sed command to adjust the property avoids the need to maintain a web.xml template which
# in turn updates frequently relative to the other property files. Thus this recipe becomes
# suitable against a larger range of bigdata releases.
#
- execute "set absolute path for RWStore.properties" do
- cwd "#{node['bigdata'][:web_home]}/WEB-INF"
- command "sed -i 's|<param-value>../webapps/bigdata/RWStore.properties|<param-value>#{node['bigdata'][:home]}/RWStore.properties|' web.xml"
- end
+ if node['bigdata'][:build_from_svn]
+ execute "set absolute path for RWStore.properties" do
+ cwd "#{node['bigdata'][:web_home]}/WEB-INF"
+ command "sed -i 's|<param-value>../webapps/bigdata/WEB-INF/RWStore.properties|<param-value>#{node['bigdata'][:home]}/RWStore.properties|' web.xml"
+ end
+ #
+ # Remove original RWStore.properties file to avoid user confusion
+ #
+ file "#{node['bigdata'][:web_home]}/WEB-INF/RWStore.properties" do
+ action :delete
+ end
+ else
+ #
+ # 1.3.0 uses a different path for RWStore.properties. We can remove this if block in 1.3.1
+ #
+ execute "set absolute path for RWStore.properties" do
+ cwd "#{node['bigdata'][:web_home]}/WEB-INF"
+ command "sed -i 's|<param-value>../webapps/bigdata/RWStore.properties|<param-value>#{node['bigdata'][:home]}/RWStore.properties|' web.xml"
+ end
- #
- # Delete all log files so that the error and warning messages that appeared during the installation
- # process do not unnecessarily alarm anyone.
- #
- execute "remove log files before retart" do
- cwd "#{node['tomcat'][:log_dir]}"
- command "rm *"
+ #
+ # Remove original RWStore.properties file to avoid user confusion
+ #
+ file "#{node['bigdata'][:web_home]}/RWStore.properties" do
+ action :delete
+ end
end
end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dme...@us...> - 2014-05-13 10:36:37
|
Revision: 8291
http://sourceforge.net/p/bigdata/code/8291
Author: dmekonnen
Date: 2014-05-13 10:36:35 +0000 (Tue, 13 May 2014)
Log Message:
-----------
Removed Paths:
-------------
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/README.md
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/attributes/
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/files/
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/metadata.rb
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/recipes/
branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/templates/
Deleted: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/README.md
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/README.md 2014-05-13 10:34:20 UTC (rev 8290)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/README.md 2014-05-13 10:36:35 UTC (rev 8291)
@@ -1,114 +0,0 @@
-systap-bigdata Cookbook
-======================
-This cookbook provides [http://www.bigdata.com/bigdata/blog/](bigdata v1.3.0) under Tomcat 7 (latest), with Oracle JDK 7 (latest) within an Ubuntu 12.0.4 VM.
-
-Typical synopsis:
-
- % vagrant up
-
- The bigdata service is then available at: http://33.33.33.10:8080/bigdata/
-
-
-Requirements
-------------
-
-#### packages
-In a stand alone context, this cookbook assumes the following resources have been installed:
-
-* `VirtualBox` - Virtual machine provider [http://virtualbox.org/](http://virtualbox.org/)
-* `Vagrant` - Environment assembler [http://vagrantup.com/](http://vagrantup.com/)
-* `Berkshelf` - The Berkshelf cookbook manager [http://berkshelf.com/](http://berkshelf.com/).
-
-
-#### cookbook dependencies
-Chef 10.14.2 or higher - has not been tested with previous versions.
-
-The following Opscode cookbooks are dependencies (automatically retrieved by `Berkshelf`):
-
-* apt
-* java
-* tomcat
-
-
-
-Attributes
-----------
-
-
-#### systap-bigdata::default
-<table>
- <tr>
- <th>Key</th>
- <th>Type</th>
- <th>Description</th>
- <th>Default</th>
- </tr>
- <tr>
- <td><tt>url</tt></td>
- <td>String</td>
- <td>where to download the bigdata.war file form</td>
- <td><tt>http://sourceforge.net/projects/bigdata/
- files/bigdata/1.3.0/bigdata.war/download</tt></td>
- </tr>
- <tr>
- <td><tt>home</tt></td>
- <td>String</td>
- <td>where the extracted bigdata.war contents are found</td>
- <td>Default: <tt>/var/lib/tomcat7/webapps/bigdata</tt></td>
- </tr>
- <tr>
- <td><tt>etc</tt></td>
- <td>String</td>
- <td>Where under the tomcat root the log files and the bigdata.jni should reside. Discussed in <a href="http://sourceforge.net/apps/mediawiki/bigdata/index.php?title=NanoSparqlServer#Common_Startup_Problems">"Common Startup Problmems</a></td>
- <td>Default: <tt>/var/lib/tomcat7/webapps/bigdata/etc</tt></td>
- </tr>
-</table>
-
-
-Usage
------
-### Stand Alone Context
-To bring the VM up the first time, or any future time after a `halt`, invoke from the cookbook directory:
-
- % vagrant up
-
-The cookbbok will retrieve the Ubuntu 12.04 VM, Oracle's JDK 7, Apahce's Tomcat 7 and the Bigdata WAR file. These downloads may take a significant amount of time to complete. Should a download be interupted or some other error occur, continue with:
-
- % vagrant provision
-
-Once complete, the bigdata server will be available under:
- [http://33.33.33.10:8080/bigdata/](http://33.33.33.10:8080/bigdata/)
-
-To halt the VM:
-
- % vagrant halt
-
-To delete the VM and from VirtualBox:
-
- % vagrant destroy
-
-To login into the VM:
-
- % vagrant ssh
-
-
-### Cookbook Context
-
-To use as a reciple in new cookbook, just include `systap-bigdata` in your node's `run_list` in the standard way:
-
-```
- "run_list": [
- "recipe[systap-bigdata::default]",
- ...
- ]
-
-```
-
-
-License and Authors
--------------------
-Author:: Daniel Mekonnen [daniel<no-spam-at>systap.com]
-
-```
-This pakcage may be resiributed under the same terms and conditions as the Bigdata project that it is a part of.
-```
Deleted: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/metadata.rb
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/metadata.rb 2014-05-13 10:34:20 UTC (rev 8290)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-bigdata/metadata.rb 2014-05-13 10:36:35 UTC (rev 8291)
@@ -1,12 +0,0 @@
-name 'bigdata'
-maintainer 'Daniel Mekonnen'
-maintainer_email 'daniel<no-spam-at>systap.com'
-license 'All rights reserved'
-description 'Installs/Configures bigdata'
-long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '0.1.1'
-depends 'apt'
-depends 'java', '>= 1.22.0'
-depends 'ant'
-depends 'tomcat'
-depends 'subversion'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X