kuzushi 0.0.7 → 0.0.8

data/Rakefile

@@ -13,6 +13,7 @@ Jeweler::Tasks.new do |s|
 	s.add_dependency "rest-client"
 	s.add_dependency "json"
 	s.add_dependency "rush"
+	s.add_dependency "ohai"
 end
 
 Jeweler::RubyforgeTasks.new

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/kuzushi.rb

@@ -3,24 +3,28 @@ require 'json'
 require 'restclient'
 require 'ostruct'
 require 'rush'
+require 'ohai'
 
 class Kuzushi
 	def initialize(url)
 		@base_url = File.dirname(url)
 		@name = File.basename(url)
 		@config_names = []
-		@config = []
+		@configs = []
 		@packages = []
 		@tasks = []
 		load_config_stack(@name)
-		@merge = @config.reverse.inject({}) { |i,c| i.merge(c) }
+		@config = @configs.reverse.inject({}) { |i,c| i.merge(c) }
+		ohai = Ohai::System.new
+		ohai.all_plugins
+		@system = ohai.data
 		process_stack
 	end
 
 	def load_config_stack(name)
 		@config_names << name
-		@config << JSON.parse(RestClient.get("#{@base_url}/#{name}"))
-		if import = @config.last["import"]
+		@configs << JSON.parse(RestClient.get("#{@base_url}/#{name}"))
+		if import = @configs.last["import"]
 			load_config_stack(import)
 		end
 	end
@@ -84,8 +88,9 @@ class Kuzushi
 		task "wait for volume #{v.device}" do
 			wait_for_volume v.device
 		end
-		set_scheduler(v)
-		check_format(v)
+		set_readahead v 
+		set_scheduler v 
+		check_format  v 
 	end
 
 	def process_raids(r)
@@ -93,12 +98,14 @@ class Kuzushi
 			begin
 				shell "mdadm --assemble #{r.device} #{r.drives.join(" ")}"
 			rescue Object => o
+				## sometimes the disks come back with odd error messages - retry seems to be the best option
 				puts "error: #{o.message}"
 				retry
 			end
 		end
+		set_readahead r
 		set_scheduler r
-		check_format r
+		check_format  r
 		add_package "mdadm"
 	end
 
@@ -111,7 +118,8 @@ class Kuzushi
 	def process_files(f)
 		fetch("/templates/#{f.template}") do |file|
 			task "setting up #{f.file}" do
-				shell "erb #{f.template} > #{f.file}" ## FIXME
+				t = ERB.new File.read(file), 0, '<>'
+				File.open(f.file,"w") { |f| f.write(t.render) }
 			end
 		end
 	end
@@ -124,6 +132,14 @@ class Kuzushi
 		end 
 	end
 
+	def set_readahead(v)
+		if v.readahead
+			task "set readahead for #{v.device}" do
+				shell "blockdev --setra #{v.readahead} #{v.device}"
+			end
+		end
+	end
+
 	def set_scheduler(v)
 		if v.scheduler
 			task "set scheduler for #{v.device}" do
@@ -197,7 +213,7 @@ class Kuzushi
 	end
 
 	def get(key)
-		@merge[key.to_s]
+		@config[key.to_s]
 	end
 
 	def get_array(key)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kuzushi
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Orion Henry
@@ -42,6 +42,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: ohai
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: A tool used by the sumo gem for performing instance setup and management in AWS
 email: orion@heroku.com
 executables: