[Bigdata-commit] SF.net SVN: bigdata:[8219] branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/ resources/deployment/vagrant/systap-aws-bigdata-ha

[<dme...@us...>]

Revision: 8219
          http://sourceforge.net/p/bigdata/code/8219
Author:   dmekonnen
Date:     2014-05-07 15:31:17 +0000 (Wed, 07 May 2014)
Log Message:
-----------
attribute simplification and version bump

Modified Paths:
--------------
    branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/attributes/default.rb
    branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/metadata.rb
    branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/recipes/default.rb

Modified: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/attributes/default.rb
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/attributes/default.rb	2014-05-07 14:53:21 UTC (rev 8218)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/attributes/default.rb	2014-05-07 15:31:17 UTC (rev 8219)
@@ -3,8 +3,8 @@
 default['systap-bigdataHA'][:bigdata_group] = "bigdata"
 
 # Where to find and build bigdata code
-# default['systap-bigdataHA'][:svn]     = "https://svn.code.sf.net/p/bigdata/code/branches/BIGDATA_RELEASE_1_3_0"
-default['systap-bigdataHA'][:svn]     = "https://svn.code.sf.net/p/bigdata/code/branches/DEPLOYMENT_BRANCH_1_3_1"
+default['systap-bigdataHA'][:svn]     = "https://svn.code.sf.net/p/bigdata/code/branches/BIGDATA_RELEASE_1_3_0"
+# default['systap-bigdataHA'][:svn]     = "https://svn.code.sf.net/p/bigdata/code/branches/DEPLOYMENT_BRANCH_1_3_1"
 default['systap-bigdataHA'][:source]  = "/home/ubuntu/bigdata-code"
 
 # Name of the federation of services (controls the Apache River GROUPS).

Modified: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/metadata.rb
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/metadata.rb	2014-05-07 14:53:21 UTC (rev 8218)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/metadata.rb	2014-05-07 15:31:17 UTC (rev 8219)
@@ -4,7 +4,7 @@
 license		'All rights reserved'
 description	'Installs/Configures Systap Bigdata High Availability'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.txt'))
-version		'0.1.0'
+version		'0.1.1'
 
 depends		'apt'
 depends		'java', '>= 1.22.0' 

Modified: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/recipes/default.rb
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/recipes/default.rb	2014-05-07 14:53:21 UTC (rev 8218)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/recipes/default.rb	2014-05-07 15:31:17 UTC (rev 8219)
@@ -21,7 +21,6 @@
 	action :create
 end
 
-# directory node['systap-bigdataHA'][:fed_dir] do
 execute "change the ownership of the bigdata home directory to bigdata, which strangely is not" do
  	user "root"
  	group "root"
@@ -58,16 +57,6 @@
 end
 
 #
-# Copy the /etc/init.d/bigdataHA template:
-#
-# template "/etc/init.d/bigdataHA" do
-# 	source  "init.d/bigdataHA.erb"
-# 	user 'root'
-# 	group 'root'
-# 	mode 00755
-# end
-
-#
 # Create the log directory for bigdata:
 #
 directory node['systap-bigdataHA'][:log_dir] do
@@ -90,20 +79,19 @@
 #
 # Install the log4jHA.properties file:
 #
-template  "#{node['systap-bigdataHA'][:fed_dir]}/var/jetty/jetty.xml" do
+template  "#{node['systap-bigdataHA'][:jetty_dir]}/jetty.xml" do
 	source  "jetty.xml.erb"
 	owner   'bigdata'
 	group   'bigdata'
 	mode 00644
 end
 
-
 #
 # Set the absolute path to the RWStore.properties file
 #
 execute "set absolute path to RWStore.properties" do
-	cwd "#{node['systap-bigdataHA'][:fed_dir]}/var/jetty/WEB-INF"
-	command "sed -i 's|<param-value>WEB-INF/RWStore.properties|<param-value>#{node['systap-bigdataHA'][:fed_dir]}/var/jetty/WEB-INF/RWStore.properties|' web.xml"
+	cwd "#{node['systap-bigdataHA'][:jetty_dir]}/WEB-INF"
+	command "sed -i 's|<param-value>WEB-INF/RWStore.properties|<param-value>#{node['systap-bigdataHA'][:jetty_dir]}/WEB-INF/RWStore.properties|' web.xml"
 end
 
 #

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.