awsborn 0.3.9 → 0.4.0

data/README.mdown

@@ -65,7 +65,7 @@ Servers take five different directives:
 * `image_id` -- a valid EC2 AMI.  Specify `:sudo_user` as an option if the AMI
   does not allow you to log in as root.
 * `security_group` -- a security group that you own.
-* `keys` -- one or more globs to public ssh keys.  When the servers are running,
+* `keys` -- one or more globs to public ssh key files.  When the servers are running,
   `root` will be able to log in using any one of these keys.
 * `bootstrap_script` -- path to a script which will be run on each instance as
   soon as it is started.  Use it to bootstrap `chef` and let `chef` take it from
@@ -87,7 +87,12 @@ Mandatory keys:
 * `:zone` -- the availability zone for the server.  One of `:us_east_1a`, `:us_east_1b`,
   `:us_east_1c`, `:us_west_1a`, `:us_west_1b`, `:eu_west_1a`, `:eu_west_1b`.
 * `:disk` -- a hash of `device => volume-id`.  Awsborn uses the disks to tell if a server
-  is running or not (see *Launching a cluster*).
+  is running or not (see *Launching a cluster*).  `volume-id` can also be an array
+  `[volume-id, :format]`, in which case `the_server.format_disk_on_device?(device)`
+  will return `true`.  See `contrib/cookbooks/ec2-ebs` for example usage.
+
+Optional keys:
+
 * `:ip` -- a domain name which translates to an elastic ip.  If the domain name does not
   contain a full stop (dot) and `domain` has been specified above, the domain is added.
 
@@ -206,6 +211,7 @@ Awsborn integrates with [Chef Solo](http://github.com/opscode/chef).  An example
             "ec2-ebs",
             "git",
             "gems",
+            "lumberjack"
           ]
         }
       end
@@ -218,7 +224,12 @@ Just add a `Rakefile` in the same directory:
     require './servers'
 
 You are now able to run `rake` to start all servers and run Chef on each of them.
-See `rake -T` for more options.
+Other rake tasks include:
+
+* `rake chef` - Run chef on all servers, or the ones specified with `host=name1,name2`.
+* `rake chef:debug` - Ditto, but with chef's log level set to `debug`.
+* `rake start` - Start all servers (or host=name1,name2) but don't run `chef`.
+
 
 ## Bugs and surprising features
 
@@ -227,7 +238,6 @@ No bugs are known at this time.
 ### Untested features
 
 * Launching without ssh keys.  (I suppose certain AMIs would support that.)
-* Running without elastic ip.
 
 ## To do / Could do
 

data/VERSION

@@ -1 +1 @@
-0.3.9
+0.4.0

data/contrib/chef-bootstrap.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+echo '------------------'
+echo 'Bootstrapping Chef'
+echo
+
+aptitude -y update
+aptitude -y install gcc g++ curl build-essential \
+  libxml-ruby libxml2-dev \
+  ruby irb ri rdoc ruby1.8-dev libzlib-ruby libyaml-ruby libreadline-ruby \
+  libruby libruby-extras libopenssl-ruby \
+  libdbm-ruby libdbi-ruby libdbd-sqlite3-ruby \
+  sqlite3 libsqlite3-dev libsqlite3-ruby
+
+curl -L 'http://rubyforge.org/frs/download.php/69365/rubygems-1.3.6.tgz' | tar zxf -
+cd rubygems* && ruby setup.rb --no-ri --no-rdoc
+
+ln -sfv /usr/bin/gem1.8 /usr/bin/gem
+
+gem install chef ohai --no-ri --no-rdoc
+
+echo
+echo 'Bootstrapping Chef - done'
+echo '-------------------------'

data/contrib/cookbooks/ec2-ebs/recipes/default.rb

@@ -0,0 +1,38 @@
+#
+# Cookbook Name:: ec2-ebs
+# Recipe:: default
+#
+# Assumes volumes are preformatted by YOU or specified as
+# # in cluster:
+# server :log_a, :zone => :eu_west_1a, :disk => {:sdf => ["vol-abcd1234", :format]}
+# # in chef_dna:
+# :ebs_volumes => [
+#   {:device => "sdf", :path => "/apps", :format => format_disk_on_device?("sdf")}
+# ],
+
+
+for ebs_volume in (node["ebs_volumes"] || [])
+  if (`grep /dev/#{ebs_volume[:device]} /etc/fstab` == "")
+    while not File.exists?("/dev/#{ebs_volume[:device]}")
+      Chef::Log.info("EBS volume device /dev/#{ebs_volume[:device]} not ready...")
+      sleep 5 
+    end
+
+    execute "format #{ebs_volume[:device]}" do
+      command "mkfs -t ext3 -F /dev/#{ebs_volume[:device]}"
+      only_if { ebs_volume[:format] }
+    end
+
+    directory ebs_volume[:path] do
+      owner 'root'
+      group 'root'
+      mode 0755
+    end
+  
+    mount ebs_volume[:path] do
+      device "/dev/#{ebs_volume[:device]}"
+      fstype "ext3"
+      action [:mount, :enable]
+    end
+  end
+end

data/lib/awsborn/awsborn.rb

@@ -3,7 +3,7 @@ module Awsborn
   class ServerError < StandardError ; end
 
   class << self
-    attr_writer :access_key_id, :secret_access_key, :logger, :remote_chef_path
+    attr_writer :access_key_id, :secret_access_key, :logger, :remote_chef_path, :chef_log_level
     attr_accessor :verbose
 
     Awsborn.verbose = true
@@ -44,7 +44,7 @@ module Awsborn
   
     def logger
       unless defined? @logger
-        dir = [File.dirname(File.expand_path($0)), '/tmp'].find { |d| File.writable?(d) }
+        dir = [Dir.pwd, '/tmp'].find { |d| File.writable?(d) }
         if dir
           file = File.open(File.join(dir, 'awsborn.log'), 'a')
           file.sync = true
@@ -80,6 +80,10 @@ module Awsborn
     def verbose_output(message)
       puts message if Awsborn.verbose
     end
-    
+
+    def chef_log_level
+      @chef_log_level || :info
+    end
+
   end
 end

data/lib/awsborn/known_hosts_updater.rb

@@ -26,10 +26,11 @@ module Awsborn
         tries += 1
         try_update
       rescue SecurityError => e
-        if tries < 5
+        if tries < 8
           logger.debug e.message
-          logger.debug "Sleeping, try #{tries}"
-          sleep([2**tries, 15].min)
+          sleep_time = [2**tries, 30].min
+          logger.debug "Fingerprint try #{tries} failed, sleeping #{sleep_time} seconds"
+          sleep(sleep_time)
           retry
         else
           raise e

data/lib/awsborn/rake.rb

@@ -7,36 +7,48 @@ module Awsborn
         default_klass.clusters.first
       end
 
-      desc "Start all servers (if needed) and deploy with chef"
-      task :default => [:start, :chef]
+      desc "Default: Start all servers (if needed) and deploy with chef."
+      task :all => [:start, "chef:run"]
+      task :default => :all
 
-      desc "Start all servers"
-      task :start do
-        default_cluster.launch
+      desc "Start all servers (or host=name1,name2)."
+      task :start do |t,args|
+        hosts = args[:host] && args[:host].split(',')
+        default_cluster.launch hosts
       end
 
-      desc "Run chef on all servers"
-      task :chef => [:check_syntax] do
-        default_cluster.each do |server|
-          server.cook
+      desc "Run chef on all servers (or host=name1,name2)."
+      task :chef => "chef:run"
+
+      namespace :chef do
+        task :run => [:check_syntax] do |t,args|
+          hosts = args[:host] && args[:host].split(',')
+          default_cluster.each do |server|
+            server.cook if hosts.nil? || hosts.include?(server.name.to_s)
+          end
         end
-      end
-      task :cook => [:chef]
 
-      desc "Check your cookbooks and config files for syntax errors"
-      task :check_syntax do
-        Dir["**/*.rb"].each do |recipe|
-          RakeFileUtils.verbose(false) do
-            sh %{ruby -c #{recipe} > /dev/null} do |ok, res|
-              raise "Syntax error in #{recipe}" if not ok 
+        desc "Run chef on all servers with log_level debug."
+        task :debug => [:set_chef_debug, :run]
+        task :set_chef_debug do
+          Awsborn.chef_log_level = :debug
+        end
+
+        desc "Check your cookbooks and config files for syntax errors."
+        task :check_syntax do
+          Dir["**/*.rb"].each do |recipe|
+            RakeFileUtils.verbose(false) do
+              sh %{ruby -c #{recipe} > /dev/null} do |ok, res|
+                raise "Syntax error in #{recipe}" if not ok 
+              end
             end
           end
         end
-      end
 
-      desc "Create a new cookbook (with cookbook=name)"
-      task :new_cookbook do
-        create_cookbook("cookbooks")
+        desc "Create a new cookbook (with cookbook=name)."
+        task :new_cookbook do
+          create_cookbook("cookbooks")
+        end
       end
 
       def create_cookbook(dir)

data/lib/awsborn/server.rb

@@ -57,7 +57,7 @@ module Awsborn
 
     def running?
       map = {}
-      disk.values.each { |vol_id| map[vol_id] = ec2.instance_id_for_volume(vol_id) }
+      disk_volume_ids.each { |vol_id| map[vol_id] = ec2.instance_id_for_volume(vol_id) }
       ids = map.values.uniq
       if ids.size > 1
         raise ServerError, "Volumes for #{self.class.name}:#{name} are connected to several instances: #{map.inspect}"
@@ -153,13 +153,14 @@ module Awsborn
       logger.debug "Bootstrapping #{name}"
       script = bootstrap_script
       basename = File.basename(script)
-      system "scp #{script} root@#{elastic_ip}:/tmp"
-      system "ssh root@#{elastic_ip} 'cd /tmp && chmod 700 #{basename} && ./#{basename}'"
+      system "scp #{script} root@#{host_name}:/tmp"
+      system "ssh root@#{host_name} 'cd /tmp && chmod 700 #{basename} && ./#{basename}'"
     end
     
     def attach_volumes
       logger.debug "Attaching volumes #{disk.values.join(', ')} to #{name}"
-      disk.each_pair do |device, volume|
+      disk.each_pair do |device, str_or_ary|
+        volume = str_or_ary.is_a?(Array) ? str_or_ary.first : str_or_ary
         device = "/dev/#{device}" if device.is_a?(Symbol) || ! device.match('/')
         res = ec2.attach_volume(volume, device)
       end
@@ -181,7 +182,7 @@ module Awsborn
     def run_chef
       logger.info "Running chef on #{host_name}"
       # Absolute path to config files to avoid a nasty irrational bug.
-      sh "ssh root@#{host_name} \"cd #{Awsborn.remote_chef_path}; chef-solo -c #{Awsborn.remote_chef_path}/config/solo.rb -j #{Awsborn.remote_chef_path}/config/dna.json\""
+      sh "ssh root@#{host_name} \"cd #{Awsborn.remote_chef_path}; chef-solo -l #{Awsborn.chef_log_level} -c #{Awsborn.remote_chef_path}/config/solo.rb -j #{Awsborn.remote_chef_path}/config/dna.json\""
     end
 
     def ec2
@@ -189,17 +190,33 @@ module Awsborn
     end
     
     begin :accessors
-      attr_accessor :name, :host_name, :logger
+      attr_accessor :name, :logger
       def host_name= (string)
         logger.debug "Setting host_name of #{name} to #{string}"
         @host_name = string
       end
+      def host_name
+        unless @host_name
+          logger.debug 'Looking up DNS name from volume ID'
+          self.host_name = aws_dns_name
+          logger.debug "got DNS name #{@host_name}"
+          update_known_hosts
+        end
+        @host_name
+      end
       def zone
         @options[:zone]
       end
       def disk
         @options[:disk]
       end
+      def disk_volume_ids
+        disk.values.map { |str_or_ary| str_or_ary.is_a?(Array) ? str_or_ary.first : str_or_ary }
+      end
+      def format_disk_on_device? (device)
+        volume = disk[device.to_sym]
+        volume.is_a?(Array) && volume.last == :format
+      end
       def image_id
         self.class.image_id
       end

data/lib/awsborn/server_cluster.rb

@@ -22,8 +22,9 @@ module Awsborn
       @instances << instance
     end
 
-    def launch
-      running, missing = @instances.partition { |e| e.running? }
+    def launch (names)
+      requested = names.nil? ? @instances : @instances.select { |s| names.include?(s.name.to_s) }
+      running, missing = requested.partition { |e| e.running? }
       refresh_running(running) if running.any?
       start_missing_instances(missing) if missing.any?
     end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 9
-  version: 0.3.9
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - David Vrensk
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-09 00:00:00 +02:00
+date: 2010-09-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -101,6 +101,8 @@ files:
 - README.mdown
 - Rakefile
 - VERSION
+- contrib/chef-bootstrap.sh
+- contrib/cookbooks/ec2-ebs/recipes/default.rb
 - lib/awsborn.rb
 - lib/awsborn/awsborn.rb
 - lib/awsborn/ec2.rb