kuzushi 0.0.8 → 0.0.9

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/lib/kuzushi.rb

@@ -4,6 +4,12 @@ require 'restclient'
 require 'ostruct'
 require 'rush'
 require 'ohai'
+require 'erb'
+
+## IDEAS
+
+## firewall until ready
+## ruby 1.9 compatibility
 
 class Kuzushi
 	def initialize(url)
@@ -15,10 +21,29 @@ class Kuzushi
 		@tasks = []
 		load_config_stack(@name)
 		@config = @configs.reverse.inject({}) { |i,c| i.merge(c) }
+	end
+
+	def init
+		@init = true
+		start
+	end
+
+	def start
+		process_stack
+		puts "----"
+		@tasks.each do |t|
+			puts "TASK: #{t[:description]}"
+			t[:blk].call
+		end
+		puts "----"
+	end
+
+	protected
+
+	def system
 		ohai = Ohai::System.new
 		ohai.all_plugins
-		@system = ohai.data
-		process_stack
+		ohai
 	end
 
 	def load_config_stack(name)
@@ -36,12 +61,11 @@ class Kuzushi
 		process :local_packages
 		process :gems
 		process :volumes
-		process :raids
-		process :mounts
 		process :files
 		process :users
 
 		script get("after")
+		script get("init") if init?
 	end
 
 	## magic goes here
@@ -59,6 +83,7 @@ class Kuzushi
 					send("process_#{type}", item)
 				end
 				script item["after"]
+				script item["init"] if init?
 			end
 		end
 	end
@@ -66,7 +91,7 @@ class Kuzushi
 	def process_packages
 		@packages = get_array("packages")
 		task "install packages" do
-			shell "apt-get update && apt-get upgrade -y && apt-get install -y #{@packages.join(" ")}", "DEBIAN_FRONTEND" => "noninteractive", "DEBIAN_PRIORITY" => "critical"
+			shell "apt-get update && apt-get upgrade -y && apt-get install -y #{@packages.join(" ")}"
 		end
 	end
 
@@ -85,39 +110,56 @@ class Kuzushi
 	end
 
 	def process_volumes(v)
+		handle_ebs    v if v.type == "ebs"
+		handle_raid   v if v.type == "raid"
+		set_readahead v if v.readahead
+		set_scheduler v if v.scheduler
+		handle_format v if v.format
+		handle_mount  v if v.mount
+	end
+
+	def handle_ebs(v)
 		task "wait for volume #{v.device}" do
 			wait_for_volume v.device
 		end
-		set_readahead v 
-		set_scheduler v 
-		check_format  v 
 	end
 
-	def process_raids(r)
-		task "assemble raid #{r.device}" do
-			begin
+	def handle_raid(r)
+		task "create raid #{r.device}", :init => true do
+			shell "mdadm --create #{r.device} -n #{r.drives.size} -l #{r.level} -c #{r.chunksize || 64} #{r.drives.join(" ")}"
+		end
+		task "assemble raid #{r.device}" do  ## assemble fails a lot with device busy - is udev to blame :(
+			if not dev_exists? r.device
+				shell "service stop udev"
 				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
+				shell "service start udev"
 			end
 		end
-		set_readahead r
-		set_scheduler r
-		check_format  r
 		add_package "mdadm"
 	end
 
-	def process_mounts(m)
-		task "mount #{m.label}" do
-			shell "mkdir -p #{m.label} && mount -o #{m.options} -L #{m.label} #{m.label}"
+	def handle_mount(m)
+		task "mount #{m.device}" do
+			shell "mkdir -p #{m.mount} && mount -o #{m.options || "noatime"} #{m.device} #{m.mount}" unless mounted?(m.device)
 		end
 	end
 
+	def system_arch
+		system.kernel["machine"]
+	end
+
+	def mounted?(dev)
+		!!system.filesystem[dev]["mount"]
+	end
+
+	def package_arch
+		`dpkg --print-architecture`.chomp
+	end
+
 	def process_files(f)
 		fetch("/templates/#{f.template}") do |file|
 			task "setting up #{f.file}" do
+				@system = system
 				t = ERB.new File.read(file), 0, '<>'
 				File.open(f.file,"w") { |f| f.write(t.render) }
 			end
@@ -129,26 +171,26 @@ class Kuzushi
 			task "add authorized_key for user #{user.name}" do
 				shell "su - #{user.name} -c 'mkdir -p .ssh; echo \"#{key}\" >> .ssh/authorized_keys; chmod -R 0600 .ssh'"
 			end
-		end 
+		end
 	end
 
 	def set_readahead(v)
-		if v.readahead
-			task "set readahead for #{v.device}" do
-				shell "blockdev --setra #{v.readahead} #{v.device}"
-			end
+		task "set readahead for #{v.device}" do
+			shell "blockdev --setra #{v.readahead} #{v.device}"
 		end
 	end
 
 	def set_scheduler(v)
-		if v.scheduler
-			task "set scheduler for #{v.device}" do
-				shell "echo #{v.scheduler} > /sys/block/#{File.basename(v.device)}/queue/scheduler"
-			end
+		task "set scheduler for #{v.device}" do
+			shell "echo #{v.scheduler} > /sys/block/#{File.basename(v.device)}/queue/scheduler"
 		end
 	end
 
-	def check_format(v)
+	def handle_format(v)
+		task "formatting #{v.device}", :init => true do
+			label = "-L " + v.label rescue ""
+			"mkfs.#{v.format} #{label} #{v.device}"
+		end
 		add_package "xfsprogs" if v.format == "xfs"
 	end
 
@@ -157,7 +199,7 @@ class Kuzushi
 	end
 
 	def package(p, &block)
-		fetch("/packages/#{p}_i386.deb") do |file|
+		fetch("/packages/#{p}_#{package_arch}.deb") do |file|
 			block.call(file)
 		end
 	end
@@ -221,31 +263,28 @@ class Kuzushi
 	end
 
 	def wait_for_volume(vol)
-		until File.exists?("/sys/block/#{File.basename(vol)}") do
+		## Maybe use ohai here instead -- FIXME
+		until dev_exists? vol do
 			puts "waiting for volume #{vol}"
 			sleep 2
 		end
 	end
 
-	def start
-		puts "----"
-		@tasks.each do |t|
-			puts "TASK: #{t[:description]}"
-			t[:blk].call
-		end
-		puts "----"
+	def shell(cmd)
+		puts "# #{cmd}"
+		puts Rush.bash cmd
 	end
 
-	def shell(cmd, env = {})
-		puts "# #{cmd}"
-		puts Rush.bash cmd, :env => env
+	def init?
+		@init ||= false
 	end
 
-	def task(description, &blk)
+	def task(description, options = {} &blk)
+		return if options[:init] and not init?
 		@tasks << { :description => description, :blk => blk }
 	end
 
-	def path
-		Dir["**/config.json"]
+	def dev_exists?(dev)
+		File.exists?("/sys/block/#{File.basename(dev)}")
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kuzushi
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Orion Henry
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-19 00:00:00 -05:00
+date: 2010-02-21 00:00:00 -05:00
 default_executable: kuzushi
 dependencies: 
 - !ruby/object:Gem::Dependency