cardmagic-sumo 0.3.1 → 0.3.4

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.4

data/bin/sumo

@@ -15,7 +15,7 @@ class CLI < Thor
 		if role
 			task("Bootstrap chef") { sumo.bootstrap_chef(host) }
 			role.split(',').each do |role|
-				task("Setup #{role}") { sumo.setup_role(host, role) }
+				task("Setup #{role}") { sumo.setup_role(id, role) }
 			end
 
 			resources = sumo.resources(host)
@@ -62,7 +62,7 @@ class CLI < Thor
 	def role(role, id=nil)
 		inst = sumo.find(id) || sumo.running.first || abort("No running instances")
 		task "Setup #{role}" do
-			sumo.setup_role(inst[:hostname], role)
+			sumo.setup_role(inst[:hostname], inst[:instance_id], role)
 		end
 	end
 

data/lib/sumo.rb

@@ -15,7 +15,7 @@ class Sumo
 
 		result = ec2.run_instances(
 			:image_id => ami,
-			:instance_type => config['instance_size'] || 'm1.small',
+			:instance_type => config['instance_size'],
 			:key_name => 'sumo',
 			:security_group => [ 'sumo' ],
 			:availability_zone => config['availability_zone']
@@ -75,6 +75,14 @@ class Sumo
 		)
 		result["volumeId"]
 	end
+	
+	def format_volume(volume, instance, device, mountpoint)
+		commands = [
+			"if [ ! -d #{mountpoint} ]; then sudo mkdir #{mountpoint}; fi",
+			"if [ -b /dev/#{device}1 ]; then sudo mount /dev/#{device}1 #{mountpoint}; else echo ',,L' | sudo sfdisk /dev/#{device} && sudo mkfs.xfs /dev/#{device}1 && sudo mount /dev/#{device}1 #{mountpoint}; fi"
+		]
+		ssh(instance, commands)
+  end
 
 	def destroy_volume(volume)
 		ec2.delete_volume(:volume_id => volume)
@@ -91,7 +99,9 @@ class Sumo
 				instances << {
 					:instance_id => item.instanceId,
 					:status => item.instanceState.name,
-					:hostname => item.dnsName
+					:hostname => item.dnsName,
+					:local_dns => item.privateDnsName,
+					:private_ip => item.privateIpAddress
 				}
 			end
 		end
@@ -147,13 +157,30 @@ class Sumo
 		end
 	end
 
+	def wait_for_private_ip(instance_id)
+		raise ArgumentError unless instance_id and instance_id.match(/^i-/)
+		loop do
+			if inst = instance_info(instance_id)
+				if private_ip = inst[:private_ip]
+					return private_ip
+				end
+			end
+			sleep 1
+		end
+	end
+
 	def wait_for_ssh(hostname)
 		raise ArgumentError unless hostname
 		loop do
 			begin
 				Timeout::timeout(4) do
 					TCPSocket.new(hostname, 22)
-					return
+					IO.popen("ssh -i #{keypair_file} #{config['user']}@#{hostname} > #{config['logfile'] || "~/.sumo/ssh.log"} 2>&1", "w") do |pipe|
+      			pipe.puts "ls"
+      		end
+      		if $?.success?
+      			return
+      		end
 				end
 			rescue SocketError, Timeout::Error, Errno::ECONNREFUSED, Errno::EHOSTUNREACH
 			end
@@ -162,36 +189,51 @@ class Sumo
 
 	def bootstrap_chef(hostname)
 		commands = [
-			'apt-get update',
-			'apt-get autoremove -y',
-			'apt-get install -y ruby ruby-dev rubygems git-core',
-			'gem sources -a http://gems.opscode.com',
-			'gem install chef ohai --no-rdoc --no-ri',
-			config['cookbooks_url'] ? "git clone #{config['cookbooks_url']} chef-cookbooks" : "echo done",
+			'sudo apt-get update',
+			'sudo apt-get autoremove -y',
+			'if [ ! -f /usr/lib/ruby/1.8/net/https.rb ]; then sudo apt-get install -y xfsprogs xfsdump xfslibs-dev ruby ruby-dev rubygems libopenssl-ruby1.8 git-core; fi',
+			'if [ ! -d /etc/chef ]; then sudo mkdir /etc/chef; fi',
+			'if [ ! -d /var/lib/gems/1.8/gems/chef-* ]; then sudo gem install chef ohai --no-rdoc --no-ri; fi',
+			config['cookbooks_url'] ? "if [ -d chef-cookbooks ]; then cd chef-cookbooks; git pull; else git clone #{config['cookbooks_url']} chef-cookbooks; fi" : "echo done"
 		]
 		ssh(hostname, commands)
-		if config['cookbooks_dir']
+		if !config['cookbooks_url'] && config['cookbooks_dir']
 		  scp(hostname, config['cookbooks_dir'], "chef-cookbooks")
 	  end
+	  if config['chef-validation']
+	    scp(hostname, config['chef-validation'], "validation.pem")
+	    ssh(hostname, ["sudo mv validation.pem /etc/chef/"])
+    end
 	end
 
-	def setup_role(hostname, role)
+	def setup_role(hostname, instance_id, role)
 		commands = [
-			"cd chef-cookbooks",
-			"/var/lib/gems/1.8/bin/chef-solo -c config.json -j dna/#{role}.json"
+		  "if [ ! -f /etc/chef/client.pem ]; then cd chef-cookbooks",
+			"sudo /var/lib/gems/1.8/bin/chef-solo -c config/solo.rb -j roles/bootstrap.json -r http://s3.amazonaws.com/chef-solo/bootstrap-latest.tar.gz",
+			"if [ -f config/client.rb ]; then sudo cp config/client.rb /etc/chef/client.rb; fi",
+			"sudo /var/lib/gems/1.8/bin/chef-client",
+			"sudo rm /etc/chef/validation.pem; fi"
 		]
 		ssh(hostname, commands)
+		`knife node run_list add #{instance_id} "role[#{role}]"`
+		ssh(hostname, ["sudo /var/lib/gems/1.8/bin/chef-client"])
 	end
 
 	def ssh(hostname, cmds)
 	  unless IO.read(File.expand_path("~/.ssh/known_hosts")).include?(hostname)
 	    `ssh-keyscan -t rsa #{hostname} >> $HOME/.ssh/known_hosts`
+	    if config['deploy_key']
+	      scp(hostname, config['deploy_key'], ".ssh/id_rsa")
+      end
+      if config['known_hosts']
+        scp(hostname, config['known_hosts'], ".ssh/known_hosts")
+      end
     end
-		IO.popen("ssh -i #{keypair_file} #{config['user']}@#{hostname} > ~/.sumo/ssh.log 2>&1", "w") do |pipe|
+		IO.popen("ssh -i #{keypair_file} #{config['user']}@#{hostname} > #{config['logfile'] || "~/.sumo/ssh.log"} 2>&1", "w") do |pipe|
 			pipe.puts cmds.join(' && ')
 		end
 		unless $?.success?
-			abort "failed\nCheck ~/.sumo/ssh.log for the output"
+			abort "failed\nCheck #{config['logfile'] || "~/.sumo/ssh.log"} for the output"
 		end
 	end
 
@@ -242,7 +284,7 @@ class Sumo
 	end
 
 	def fetch_resources(hostname)
-		cmd = "ssh -i #{keypair_file} #{config['user']}@#{hostname} 'cat /root/resources' 2>&1"
+		cmd = "ssh -i #{keypair_file} #{config['user']}@#{hostname} 'sudo cat /root/resources' 2>&1"
 		out = IO.popen(cmd, 'r') { |pipe| pipe.read }
 		abort "failed to read resources, output:\n#{out}" unless $?.success?
 		parse_resources(out, hostname)
@@ -266,11 +308,16 @@ class Sumo
 		@config ||= default_config.merge read_config
 	end
 
+	def set(key, value)
+		config[key] = value
+	end
+
 	def default_config
 		{
-			'user' => 'root',
-			'ami' => 'ami-ed46a784',
-			'availability_zone' => 'us-east-1b'
+			'user' => 'ubuntu',
+			'ami' => 'ami-1234de7b', # Ubuntu 10.04 LTS (Lucid Lynx)
+			'availability_zone' => 'us-east-1d',
+			'instance_size' => 't1.micro'
 		}
 	end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cardmagic-sumo
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Adam Wiggins
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-15 00:00:00 -07:00
+date: 2010-06-24 00:00:00 -07:00
 default_executable: sumo
 dependencies: 
 - !ruby/object:Gem::Dependency